Revert "_CGImageJPEGRepresentation"

This reverts commit 5315d9b.

Frameworks/CoreGraphics/CGJPEGDecoderImage.mm

@@ -174,7 +174,7 @@ static int jpeg_find_orientation(j_decompress_ptr cinfo) {
         return 0;
 
     //  Find offset and tag count
-    DWORD offset = readDWord(curPos, left, bigEndian);
+    WORD offset = readWord(curPos, left, bigEndian);
     offset -= 8;
     if (offset > left)
         return 0;
@@ -387,24 +387,13 @@ static int jpeg_find_orientation(j_decompress_ptr cinfo) {
         case 1:
             _orientation = 0;
             break;
-        case 2:
-            _orientation = UIImageOrientationUpMirrored;
-            break;
+
         case 3:
             _orientation = UIImageOrientationDown;
             break;
-        case 4:
-            _orientation = UIImageOrientationDownMirrored;
-            break;
-        case 5:
-            _orientation = UIImageOrientationRightMirrored;
-            break;
         case 6:
             _orientation = UIImageOrientationRight;
             break;
-        case 7:
-            _orientation = UIImageOrientationLeftMirrored;
-            break;
         case 8:
             _orientation = UIImageOrientationLeft;
             break;

Frameworks/UIKit/UIImage.mm

@@ -66,11 +66,9 @@ void UIImageSetLayerContents(CALayer* layer, UIImage* image) {
     if ([layer contentsScale] != [image scale]) {
         [layer setContentsScale:[image scale]];
     }
-
-    // if setContentsOrientation with image orientation here,
-    // the Image will be rotated twice when shown in the screen.
-    [layer setContentsOrientation:0];
-
+    if ([layer contentsOrientation] != [image imageOrientation]) {
+        [layer setContentsOrientation:[image imageOrientation]];
+    }
     CGRect stretch = [image _imageStretch];
     if (!CGRectEqualToRect([layer contentsCenter], stretch)) {
         [layer setContentsCenter:stretch];
@@ -115,12 +113,11 @@ - (void)encodeWithCoder:(NSCoder*)encoder {
 }
 
 + (UIImageCachedObject*)cacheImage:(UIImage*)image withName:(NSString*)name {
-    // Cache the image
+    //  Cache the image
     UIImageCachedObject* obj = [UIImageCachedObject new];
     obj->_scale = image->_scale;
     obj->_imageStretch = image->_imageStretch;
     obj->m_pImage = image->m_pImage;
-    obj->_orientation = image->_orientation;
     CGImageRetain(obj->m_pImage);
     obj->_cacheName = [name copy];
     pthread_mutex_lock(&imageCacheLock);
@@ -462,7 +459,6 @@ - (instancetype)initWithContentsOfFile:(NSString*)pathAddr {
         _scale = cachedImage->_scale;
         _imageStretch = cachedImage->_imageStretch;
         _isFromCache = true;
-        _orientation = cachedImage->_orientation;
         pthread_mutex_unlock(&imageCacheLock);
         return self;
     }
@@ -1365,10 +1361,11 @@ + (UIImage*)animatedResizableImageNamed:(NSString*)name
 }
 
 /**
- @Status Interoperable
+ @Status Stub
 */
 NSData* UIImageJPEGRepresentation(UIImage* img, CGFloat quality) {
-    return _CGImageJPEGRepresentation(img, quality);
+    UNIMPLEMENTED();
+    return StubReturn();
 }
 
 /**

Frameworks/UIKit/UIImageCachedObject.h

@@ -22,7 +22,6 @@
     id _cacheName;
     float _scale;
     CGRect _imageStretch;
-    UIImageOrientation _orientation;
 }
 - (void)dealloc;
 @end

Frameworks/include/CGImageInternal.h

@@ -115,5 +115,5 @@ class __CGImage: private objc_object {
 typedef void (*CGImageDestructionListener)(CGImageRef img);
 COREGRAPHICS_EXPORT void CGImageAddDestructionListener(CGImageDestructionListener listener);
 COREGRAPHICS_EXPORT NSData* _CGImagePNGRepresentation(UIImage* img);
-COREGRAPHICS_EXPORT NSData* _CGImageJPEGRepresentation(UIImage* img, CGFloat compressionQuality);
+
 #endif

build/CoreGraphics/dll/CoreGraphics.def

@@ -346,7 +346,6 @@ LIBRARY CoreGraphics
         CGPNGImageCreateFromData
         CGJPEGImageCreateFromFile
         CGPNGImageCreateFromFile
-        _CGImageJPEGRepresentation
         _CGImagePNGRepresentation
 
         ; CGLayer.mm