Merge pull request #116 from bcse/main

Fix: Create JPEG images without embedded ICC profile

Author: CaiJingLong

image_editor_common/ios/Classes/EditorUIImageHandler.m

@@ -7,6 +7,8 @@
 
 #import "EditorUIImageHandler.h"
 #import <CoreImage/CIFilterBuiltins.h>
+#import <ImageIO/ImageIO.h>
+#import <MobileCoreServices/MobileCoreServices.h>
 
 
 void releaseCGContext(CGContextRef ref) {
@@ -114,7 +116,16 @@ - (NSData *)outputMemory {
     if (fmt.format == 0) {
         return UIImagePNGRepresentation(outImage);
     } else {
-        return UIImageJPEGRepresentation(outImage, ((CGFloat) fmt.quality) / 100);
+        NSMutableData *data = [NSMutableData new];
+        CGImageDestinationRef imageDestination = CGImageDestinationCreateWithData((__bridge CFMutableDataRef)data, kUTTypeJPEG, 1, NULL);
+        NSDictionary *options = @{
+            (id)kCGImageDestinationLossyCompressionQuality : @(((CGFloat)fmt.quality) / 100),
+            (id)kCGImageDestinationOptimizeColorForSharing: (id)kCFBooleanTrue
+        };
+        CGImageDestinationAddImage(imageDestination, outImage.CGImage, (CFDictionaryRef)options);
+        CGImageDestinationFinalize(imageDestination);
+        CFRelease(imageDestination);
+        return data;
     }
 }
 

image_editor_common/ios/Classes/FIMerger.m

@@ -7,6 +7,8 @@
 
 #import "FIMerger.h"
 #import "EditorUIImageHandler.h"
+#import <ImageIO/ImageIO.h>
+#import <MobileCoreServices/MobileCoreServices.h>
 
 @implementation FIMerger
 
@@ -35,7 +37,16 @@ - (NSData *)outputMemory:(UIImage *)image {
     if (fmt.format == 0) {
         return UIImagePNGRepresentation(image);
     } else {
-        return UIImageJPEGRepresentation(image, ((CGFloat)fmt.quality) / 100);
+        NSMutableData *data = [NSMutableData new];
+        CGImageDestinationRef imageDestination = CGImageDestinationCreateWithData((__bridge CFMutableDataRef)data, kUTTypeJPEG, 1, NULL);
+        NSDictionary *options = @{
+            (id)kCGImageDestinationLossyCompressionQuality : @(((CGFloat)fmt.quality) / 100),
+            (id)kCGImageDestinationOptimizeColorForSharing: (id)kCFBooleanTrue
+        };
+        CGImageDestinationAddImage(imageDestination, image.CGImage, (CFDictionaryRef)options);
+        CGImageDestinationFinalize(imageDestination);
+        CFRelease(imageDestination);
+        return data;
     }
 }