equal
deleted
inserted
replaced
756 aEnv->DeleteLocalRef(paletteDataClass); |
756 aEnv->DeleteLocalRef(paletteDataClass); |
757 } |
757 } |
758 return result; |
758 return result; |
759 } |
759 } |
760 |
760 |
761 Image* JniUtils::CreateImage(JNIEnv* aEnv, jobject& aImageDataObj) |
761 Image* JniUtils::CreateImage(JNIEnv* aEnv, jobject& aImageDataObj, jint aType) |
762 { |
762 { |
763 SWT_LOG_FUNC_CALL(); |
763 SWT_LOG_FUNC_CALL(); |
764 |
764 |
765 Image* result = NULL; |
765 Image* result = NULL; |
766 ImageDataWrapper* imageData = GraphicsFactory::createImageData(0); |
766 ImageDataWrapper* imageData = GraphicsFactory::createImageData(0); |
842 } |
842 } |
843 // palette data |
843 // palette data |
844 fid = aEnv->GetFieldID(imageDataClazz, "palette", "Lorg/eclipse/swt/graphics/PaletteData;"); |
844 fid = aEnv->GetFieldID(imageDataClazz, "palette", "Lorg/eclipse/swt/graphics/PaletteData;"); |
845 jobject paletteData = aEnv->GetObjectField(aImageDataObj, fid); |
845 jobject paletteData = aEnv->GetObjectField(aImageDataObj, fid); |
846 imageData->setPaletteData(CreatePaletteData(aEnv, paletteData)); |
846 imageData->setPaletteData(CreatePaletteData(aEnv, paletteData)); |
847 result = GraphicsFactory::createImage(imageData); |
847 result = GraphicsFactory::createImage(imageData, (Java::GFX::TImageType)aType); |
848 |
848 |
849 delete imageData; |
849 delete imageData; |
850 if (paletteData) |
850 if (paletteData) |
851 { |
851 { |
852 aEnv->DeleteLocalRef(paletteData); |
852 aEnv->DeleteLocalRef(paletteData); |