jdk-sandbox: comparison jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c

equal deleted inserted replaced

-:f4e5b541f29d
+:049cc21737df
 #include "sun_java2d_cmm_lcms_LCMS.h"
 #include "jni_util.h"
 #include "Trace.h"
 #include "Disposer.h"
 #include "lcms2.h"
+#include "jlong.h"
 #define ALIGNLONG(x) (((x)+3) & ~(3))         // Aligns to DWORD boundary
 #ifdef USE_BIG_ENDIAN
 #endif
 typedef struct lcmsProfile_s {
 cmsHPROFILE pf;
 } lcmsProfile_t, *lcmsProfile_p;
-typedef union storeID_s {    /* store SProfile stuff in a Java Long */
-lcmsProfile_p lcmsPf;
-cmsHTRANSFORM xf;
-jobject jobj;
-jlong j;
-} storeID_t, *storeID_p;
 typedef union {
 cmsTagSignature cms;
 jint j;
 } TagSignature_t, *TagSignature_p;
 cmsSetLogErrorHandler(errorHandler);
 return JNI_VERSION_1_6;
 }
 void LCMS_freeProfile(JNIEnv *env, jlong ptr) {
-storeID_t sProfile;
+lcmsProfile_p p = (lcmsProfile_p)jlong_to_ptr(ptr);
-sProfile.j = ptr;
+if (p != NULL) {
-if (sProfile.lcmsPf != NULL) {
+if (p->pf != NULL) {
-if (sProfile.lcmsPf->pf != NULL) {
+cmsCloseProfile(p->pf);
-cmsCloseProfile(sProfile.lcmsPf->pf);
+}
-}
+free(p);
-free(sProfile.lcmsPf);
 }
 }
 void LCMS_freeTransform(JNIEnv *env, jlong ID)
 {
-storeID_t sTrans;
+cmsHTRANSFORM sTrans = jlong_to_ptr(ID);
-sTrans.j = ID;
 /* Passed ID is always valid native ref so there is no check for zero */
-cmsDeleteTransform(sTrans.xf);
+cmsDeleteTransform(sTrans);
 }
 /*
 * Class:     sun_java2d_cmm_lcms_LCMS
 * Method:    createNativeTransform
 jint inFormatter, jboolean isInIntPacked,
 jint outFormatter, jboolean isOutIntPacked, jobject disposerRef)
 {
 cmsHPROFILE _iccArray[DF_ICC_BUF_SIZE];
 cmsHPROFILE *iccArray = &_iccArray[0];
-storeID_t sTrans;
+cmsHTRANSFORM sTrans = NULL;
 int i, j, size;
 jlong* ids;
 size = (*env)->GetArrayLength (env, profileIDs);
 ids = (*env)->GetLongArrayElements(env, profileIDs, 0);
 }
 }
 j = 0;
 for (i = 0; i < size; i++) {
-cmsHPROFILE icc;
 cmsColorSpaceSignature cs;
+lcmsProfile_p profilePtr = (lcmsProfile_p)jlong_to_ptr(ids[i]);
-sTrans.j = ids[i];
+cmsHPROFILE icc = profilePtr->pf;
-icc = sTrans.lcmsPf->pf;
 iccArray[j++] = icc;
 /* Middle non-abstract profiles should be doubled before passing to
 * the cmsCreateMultiprofileTransform function
 */
 {
 iccArray[j++] = icc;
 }
 }
-sTrans.xf = cmsCreateMultiprofileTransform(iccArray, j,
+sTrans = cmsCreateMultiprofileTransform(iccArray, j,
 inFormatter, outFormatter, renderType, 0);
 (*env)->ReleaseLongArrayElements(env, profileIDs, ids, 0);
-if (sTrans.xf == NULL) {
+if (sTrans == NULL) {
 J2dRlsTraceLn(J2D_TRACE_ERROR, "LCMS_createNativeTransform: "
-"sTrans.xf == NULL");
+"sTrans == NULL");
 if ((*env)->ExceptionOccurred(env) == NULL) {
 JNU_ThrowByName(env, "java/awt/color/CMMException",
 "Cannot get color transform");
 }
 } else {
-Disposer_AddRecord(env, disposerRef, LCMS_freeTransform, sTrans.j);
+Disposer_AddRecord(env, disposerRef, LCMS_freeTransform, ptr_to_jlong(sTrans));
 }
 if (iccArray != &_iccArray[0]) {
 free(iccArray);
 }
-return sTrans.j;
+return ptr_to_jlong(sTrans);
 }
 /*
 * Class:     sun_java2d_cmm_lcms_LCMS
 JNIEXPORT jlong JNICALL Java_sun_java2d_cmm_lcms_LCMS_loadProfileNative
 (JNIEnv *env, jobject obj, jbyteArray data, jobject disposerRef)
 {
 jbyte* dataArray;
 jint dataSize;
-storeID_t sProf;
+lcmsProfile_p sProf = NULL;
 cmsHPROFILE pf;
 if (JNU_IsNull(env, data)) {
 JNU_ThrowIllegalArgumentException(env, "Invalid profile data");
 return 0L;
 }
-sProf.j = 0L;
 dataArray = (*env)->GetByteArrayElements (env, data, 0);
 if (dataArray == NULL) {
 // An exception should have already been thrown.
 return 0L;
 }
 }
 if (pf != NULL) {
 // create profile holder
-sProf.lcmsPf = (lcmsProfile_p)malloc(sizeof(lcmsProfile_t));
+sProf = (lcmsProfile_p)malloc(sizeof(lcmsProfile_t));
-if (sProf.lcmsPf != NULL) {
+if (sProf != NULL) {
 // register the disposer record
-sProf.lcmsPf->pf = pf;
+sProf->pf = pf;
-Disposer_AddRecord(env, disposerRef, LCMS_freeProfile, sProf.j);
+Disposer_AddRecord(env, disposerRef, LCMS_freeProfile, ptr_to_jlong(sProf));
 } else {
 cmsCloseProfile(pf);
 }
 }
-return sProf.j;
+return ptr_to_jlong(sProf);
 }
 /*
 * Class:     sun_java2d_cmm_lcms_LCMS
 * Method:    getProfileSizeNative
 * Signature: (J)I
 */
 JNIEXPORT jint JNICALL Java_sun_java2d_cmm_lcms_LCMS_getProfileSizeNative
 (JNIEnv *env, jobject obj, jlong id)
 {
-storeID_t sProf;
+lcmsProfile_p sProf = (lcmsProfile_p)jlong_to_ptr(id);
 cmsUInt32Number pfSize = 0;
-sProf.j = id;
+if (cmsSaveProfileToMem(sProf->pf, NULL, &pfSize) && ((jint)pfSize > 0)) {
-if (cmsSaveProfileToMem(sProf.lcmsPf->pf, NULL, &pfSize) && ((jint)pfSize > 0)) {
 return (jint)pfSize;
 } else {
 JNU_ThrowByName(env, "java/awt/color/CMMException",
 "Can not access specified profile.");
 return -1;
 * Signature: (J[B)V
 */
 JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_getProfileDataNative
 (JNIEnv *env, jobject obj, jlong id, jbyteArray data)
 {
-storeID_t sProf;
+lcmsProfile_p sProf = (lcmsProfile_p)jlong_to_ptr(id);
 jint size;
 jbyte* dataArray;
 cmsUInt32Number pfSize = 0;
 cmsBool status;
-sProf.j = id;
 // determine actual profile size
-if (!cmsSaveProfileToMem(sProf.lcmsPf->pf, NULL, &pfSize)) {
+if (!cmsSaveProfileToMem(sProf->pf, NULL, &pfSize)) {
 JNU_ThrowByName(env, "java/awt/color/CMMException",
 "Can not access specified profile.");
 return;
 }
 if (dataArray == NULL) {
 // An exception should have already been thrown.
 return;
 }
-status = cmsSaveProfileToMem(sProf.lcmsPf->pf, dataArray, &pfSize);
+status = cmsSaveProfileToMem(sProf->pf, dataArray, &pfSize);
 (*env)->ReleaseByteArrayElements (env, data, dataArray, 0);
 if (!status) {
 JNU_ThrowByName(env, "java/awt/color/CMMException",
 * Signature: (JI[B)V
 */
 JNIEXPORT jbyteArray JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagNative
 (JNIEnv *env, jobject obj, jlong id, jint tagSig)
 {
-storeID_t sProf;
+lcmsProfile_p sProf = (lcmsProfile_p)jlong_to_ptr(id);
 TagSignature_t sig;
 cmsInt32Number tagSize;
 jbyte* dataArray = NULL;
 jbyteArray data = NULL;
 jint bufSize;
-sProf.j = id;
 sig.j = tagSig;
 if (tagSig == SigHead) {
 cmsBool status;
 if (dataArray == NULL) {
 // An exception should have already been thrown.
 return NULL;
 }
-status = _getHeaderInfo(sProf.lcmsPf->pf, dataArray, bufSize);
+status = _getHeaderInfo(sProf->pf, dataArray, bufSize);
 (*env)->ReleaseByteArrayElements (env, data, dataArray, 0);
 if (!status) {
 JNU_ThrowByName(env, "java/awt/color/CMMException",
 }
 return data;
 }
-if (cmsIsTag(sProf.lcmsPf->pf, sig.cms)) {
+if (cmsIsTag(sProf->pf, sig.cms)) {
-tagSize = cmsReadRawTag(sProf.lcmsPf->pf, sig.cms, NULL, 0);
+tagSize = cmsReadRawTag(sProf->pf, sig.cms, NULL, 0);
 } else {
 JNU_ThrowByName(env, "java/awt/color/CMMException",
 "ICC profile tag not found");
 return NULL;
 }
 if (dataArray == NULL) {
 // An exception should have already been thrown.
 return NULL;
 }
-bufSize = cmsReadRawTag(sProf.lcmsPf->pf, sig.cms, dataArray, tagSize);
+bufSize = cmsReadRawTag(sProf->pf, sig.cms, dataArray, tagSize);
 (*env)->ReleaseByteArrayElements (env, data, dataArray, 0);
 if (bufSize != tagSize) {
 JNU_ThrowByName(env, "java/awt/color/CMMException",
 * Signature: (JI[B)V
 */
 JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_setTagDataNative
 (JNIEnv *env, jobject obj, jlong id, jint tagSig, jbyteArray data)
 {
-storeID_t sProf;
+lcmsProfile_p sProf = (lcmsProfile_p)jlong_to_ptr(id);
 cmsHPROFILE pfReplace = NULL;
 TagSignature_t sig;
 cmsBool status = FALSE;
 jbyte* dataArray;
 int tagSize;
-sProf.j = id;
 sig.j = tagSig;
 if (JNU_IsNull(env, data)) {
 JNU_ThrowIllegalArgumentException(env, "Can not write tag data.");
 return;
 // An exception should have already been thrown.
 return;
 }
 if (tagSig == SigHead) {
-status  = _setHeaderInfo(sProf.lcmsPf->pf, dataArray, tagSize);
+status  = _setHeaderInfo(sProf->pf, dataArray, tagSize);
 } else {
 /*
 * New strategy for generic tags: create a place holder,
 * dump all existing tags there, dump externally supplied
 * tag, and return the new profile to the java.
 */
-pfReplace = _writeCookedTag(sProf.lcmsPf->pf, sig.cms, dataArray, tagSize);
+pfReplace = _writeCookedTag(sProf->pf, sig.cms, dataArray, tagSize);
 status = (pfReplace != NULL);
 }
 (*env)->ReleaseByteArrayElements(env, data, dataArray, 0);
 if (!status) {
 JNU_ThrowIllegalArgumentException(env, "Can not write tag data.");
 } else if (pfReplace != NULL) {
-cmsCloseProfile(sProf.lcmsPf->pf);
+cmsCloseProfile(sProf->pf);
-sProf.lcmsPf->pf = pfReplace;
+sProf->pf = pfReplace;
 }
 }
 void* getILData (JNIEnv *env, jobject img, jint* pDataType,
 jobject* pDataObject) {
 * Signature: (Lsun/java2d/cmm/lcms/LCMSTransform;Lsun/java2d/cmm/lcms/LCMSImageLayout;Lsun/java2d/cmm/lcms/LCMSImageLayout;)V
 */
 JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_colorConvert
 (JNIEnv *env, jclass obj, jobject trans, jobject src, jobject dst)
 {
-storeID_t sTrans;
+cmsHTRANSFORM sTrans = NULL;
 int srcDType, dstDType;
 int srcOffset, srcNextRowOffset, dstOffset, dstNextRowOffset;
 int width, height, i;
 void* inputBuffer;
 void* outputBuffer;
 height = (*env)->GetIntField (env, src, IL_height_fID);
 srcAtOnce = (*env)->GetBooleanField(env, src, IL_imageAtOnce_fID);
 dstAtOnce = (*env)->GetBooleanField(env, dst, IL_imageAtOnce_fID);
-sTrans.j = (*env)->GetLongField (env, trans, Trans_ID_fID);
+sTrans = jlong_to_ptr((*env)->GetLongField (env, trans, Trans_ID_fID));
-if (sTrans.xf == NULL) {
+if (sTrans == NULL) {
 J2dRlsTraceLn(J2D_TRACE_ERROR, "LCMS_colorConvert: transform == NULL");
 JNU_ThrowByName(env, "java/awt/color/CMMException",
 "Cannot get color transform");
 return;
 }
 inputRow = (char*)inputBuffer + srcOffset;
 outputRow = (char*)outputBuffer + dstOffset;
 if (srcAtOnce && dstAtOnce) {
-cmsDoTransform(sTrans.xf, inputRow, outputRow, width * height);
+cmsDoTransform(sTrans, inputRow, outputRow, width * height);
 } else {
 for (i = 0; i < height; i++) {
-cmsDoTransform(sTrans.xf, inputRow, outputRow, width);
+cmsDoTransform(sTrans, inputRow, outputRow, width);
 inputRow += srcNextRowOffset;
 outputRow += dstNextRowOffset;
 }
 }
 cmsUInt8Number* pfBuffer = NULL;
 cmsBool status = FALSE;
 if (!cmsSaveProfileToMem(pf, NULL, &pfSize) ||
 pfSize < sizeof(cmsICCHeader) ||
-bufferSize < sizeof(cmsICCHeader))
+bufferSize < (jint)sizeof(cmsICCHeader))
 {
 return FALSE;
 }
 pfBuffer = malloc(pfSize);
 return status;
 }
 static cmsBool _setHeaderInfo(cmsHPROFILE pf, jbyte* pBuffer, jint bufferSize)
 {
-cmsICCHeader pfHeader = { 0 };
+cmsICCHeader pfHeader;
-if (pBuffer == NULL || bufferSize < sizeof(cmsICCHeader)) {
+if (pBuffer == NULL || bufferSize < (jint)sizeof(cmsICCHeader)) {
 return FALSE;
 }
 memcpy(&pfHeader, pBuffer, sizeof(cmsICCHeader));
 cmsUInt32Number pfSize = 0;
 const cmsInt32Number tagCount = cmsGetTagCount(pfTarget);
 cmsInt32Number i;
 cmsHPROFILE pfSanity = NULL;
-cmsICCHeader hdr = { 0 };
+cmsICCHeader hdr;
 cmsHPROFILE p = cmsCreateProfilePlaceholder(NULL);
 if (NULL == p) {
 return NULL;
 }
+memset(&hdr, 0, sizeof(cmsICCHeader));
 // Populate the placeholder's header according to target profile
 hdr.flags = cmsGetHeaderFlags(pfTarget);
 hdr.renderingIntent = cmsGetHeaderRenderingIntent(pfTarget);
 hdr.manufacturer = cmsGetHeaderManufacturer(pfTarget);

changeset 21232	049cc21737df
parent 21228	53476a342542
child 23010	6dadb192ad81