[Libreoffice-commits] core.git: vcl/source

[Tomaž Vajngerl]

 vcl/source/filter/GraphicNativeTransform.cxx |    6 +++---
 vcl/source/filter/jpeg/Exif.cxx              |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4cbe623af84f4a6761bf996fec82f2ea791a0769
Author: Tomaž Vajngerl <quikee at gmail.com>
Date:   Sun Apr 21 22:52:30 2013 +0200

    Fix enum Tag and Orientation usage.
    
    Change-Id: I50014b227b07a4b7bff7b2569ec55409f371b38e

diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx
index 793621b..7b3f640 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -128,7 +128,7 @@ bool GraphicNativeTransform::rotateJPEG(sal_uInt16 aRotation)
     aSourceStream.Write(aLink.GetData(), aLink.GetDataSize());
     aSourceStream.Seek( STREAM_SEEK_TO_BEGIN );
 
-    Orientation aOrientation = Orientation::TOP_LEFT;
+    Orientation aOrientation = TOP_LEFT;
 
     Exif exif;
     if ( exif.read(aSourceStream) )
@@ -144,9 +144,9 @@ bool GraphicNativeTransform::rotateJPEG(sal_uInt16 aRotation)
     aTargetStream.Seek( STREAM_SEEK_TO_BEGIN );
 
     // Reset orientation in exif if needed
-    if ( exif.hasExif() && aOrientation != Orientation::TOP_LEFT)
+    if ( exif.hasExif() && aOrientation != TOP_LEFT)
     {
-        exif.setOrientation(Orientation::TOP_LEFT);
+        exif.setOrientation(TOP_LEFT);
         exif.write(aTargetStream);
     }
 
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 318e2bd..d15cc4c 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -163,11 +163,11 @@ bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16 aOffs
     {
         ifd = (ExifIFD*) &pExifData[aOffset];
 
-        if (ifd->tag == Tag::ORIENTATION)
+        if (ifd->tag == ORIENTATION)
         {
             if(bSetValue)
             {
-                ifd->tag = Tag::ORIENTATION;
+                ifd->tag = ORIENTATION;
                 ifd->type = 3;
                 ifd->count = 1;
                 ifd->offset = maOrientation;