[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=49f4536

The following commit has been merged in the master branch:
commit 49f4536c36e1008ed46d9bf711bb42cb265e2a73
Author: vog <vog at notjusthosting.com>
Date:   Thu Jun 23 11:12:10 2011 +0000

    #689: Improved block indentation
---
 src/preview.cpp | 68 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/preview.cpp b/src/preview.cpp
index 58269c9..6ee1ad1 100644
--- a/src/preview.cpp
+++ b/src/preview.cpp
@@ -240,32 +240,32 @@ namespace {
 // class member definitions
 
     const Loader::LoaderList Loader::loaderList_[] = {
-        { 0,                   createLoaderExifDataJpeg, 0 },
-        { 0,                   createLoaderExifDataJpeg, 1 },
-        { 0,                   createLoaderExifDataJpeg, 2 },
-        { 0,                   createLoaderExifDataJpeg, 3 },
-        { 0,                   createLoaderExifDataJpeg, 4 },
-        { 0,                   createLoaderExifDataJpeg, 5 },
-        { 0,                   createLoaderExifDataJpeg, 6 },
-        { 0,                   createLoaderExifDataJpeg, 7 },
+        { 0,                       createLoaderExifDataJpeg, 0 },
+        { 0,                       createLoaderExifDataJpeg, 1 },
+        { 0,                       createLoaderExifDataJpeg, 2 },
+        { 0,                       createLoaderExifDataJpeg, 3 },
+        { 0,                       createLoaderExifDataJpeg, 4 },
+        { 0,                       createLoaderExifDataJpeg, 5 },
+        { 0,                       createLoaderExifDataJpeg, 6 },
+        { 0,                       createLoaderExifDataJpeg, 7 },
         { "image/x-panasonic-rw2", createLoaderExifDataJpeg, 8 },
-        { 0,                   createLoaderExifDataJpeg, 9 },
-        { 0,                   createLoaderTiff,         0 },
-        { 0,                   createLoaderTiff,         1 },
-        { 0,                   createLoaderTiff,         2 },
-        { 0,                   createLoaderTiff,         3 },
-        { 0,                   createLoaderTiff,         4 },
-        { 0,                   createLoaderTiff,         5 },
-        { 0,                   createLoaderTiff,         6 },
-        { 0,                   createLoaderExifJpeg,     0 },
-        { 0,                   createLoaderExifJpeg,     1 },
-        { 0,                   createLoaderExifJpeg,     2 },
-        { 0,                   createLoaderExifJpeg,     3 },
-        { 0,                   createLoaderExifJpeg,     4 },
-        { 0,                   createLoaderExifJpeg,     5 },
-        { 0,                   createLoaderExifJpeg,     6 },
-        { "image/x-canon-cr2", createLoaderExifJpeg,     7 },
-        { 0,                   createLoaderExifJpeg,     8 }
+        { 0,                       createLoaderExifDataJpeg, 9 },
+        { 0,                       createLoaderTiff,         0 },
+        { 0,                       createLoaderTiff,         1 },
+        { 0,                       createLoaderTiff,         2 },
+        { 0,                       createLoaderTiff,         3 },
+        { 0,                       createLoaderTiff,         4 },
+        { 0,                       createLoaderTiff,         5 },
+        { 0,                       createLoaderTiff,         6 },
+        { 0,                       createLoaderExifJpeg,     0 },
+        { 0,                       createLoaderExifJpeg,     1 },
+        { 0,                       createLoaderExifJpeg,     2 },
+        { 0,                       createLoaderExifJpeg,     3 },
+        { 0,                       createLoaderExifJpeg,     4 },
+        { 0,                       createLoaderExifJpeg,     5 },
+        { 0,                       createLoaderExifJpeg,     6 },
+        { "image/x-canon-cr2",     createLoaderExifJpeg,     7 },
+        { 0,                       createLoaderExifJpeg,     8 }
     };
 
     const LoaderExifJpeg::Param LoaderExifJpeg::param_[] = {
@@ -281,15 +281,15 @@ namespace {
     };
 
     const LoaderExifDataJpeg::Param LoaderExifDataJpeg::param_[] = {
-        { "Exif.Thumbnail.JPEGInterchangeFormat",    "Exif.Thumbnail.JPEGInterchangeFormatLength"    }, // 0
-        { "Exif.NikonPreview.JPEGInterchangeFormat", "Exif.NikonPreview.JPEGInterchangeFormatLength" }, // 1
-        { "Exif.Pentax.PreviewOffset",               "Exif.Pentax.PreviewLength"                     }, // 2
-        { "Exif.Minolta.ThumbnailOffset",            "Exif.Minolta.ThumbnailLength"                  }, // 3
-        { "Exif.SonyMinolta.ThumbnailOffset",        "Exif.SonyMinolta.ThumbnailLength"              }, // 4
-        { "Exif.Olympus.ThumbnailImage",             0                                               }, // 5
-        { "Exif.Olympus2.ThumbnailImage",            0                                               }, // 6
-        { "Exif.Minolta.Thumbnail",                  0                                               }, // 7
-        { "Exif.PanasonicRaw.PreviewImage",          0                                               }, // 8
+        { "Exif.Thumbnail.JPEGInterchangeFormat",      "Exif.Thumbnail.JPEGInterchangeFormatLength"      }, // 0
+        { "Exif.NikonPreview.JPEGInterchangeFormat",   "Exif.NikonPreview.JPEGInterchangeFormatLength"   }, // 1
+        { "Exif.Pentax.PreviewOffset",                 "Exif.Pentax.PreviewLength"                       }, // 2
+        { "Exif.Minolta.ThumbnailOffset",              "Exif.Minolta.ThumbnailLength"                    }, // 3
+        { "Exif.SonyMinolta.ThumbnailOffset",          "Exif.SonyMinolta.ThumbnailLength"                }, // 4
+        { "Exif.Olympus.ThumbnailImage",               0                                                 }, // 5
+        { "Exif.Olympus2.ThumbnailImage",              0                                                 }, // 6
+        { "Exif.Minolta.Thumbnail",                    0                                                 }, // 7
+        { "Exif.PanasonicRaw.PreviewImage",            0                                                 }, // 8
         { "Exif.SamsungPreview.JPEGInterchangeFormat", "Exif.SamsungPreview.JPEGInterchangeFormatLength" } // 9
     };
 

-- 
exiv2 packaging