[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=ab8738f

The following commit has been merged in the master branch:
commit ab8738f64653a34d30d9392c478c4d1da5702748
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Sep 24 10:04:38 2006 +0000

    Switched order of includes. Fixes MSVC crashes - bug #487. (Dimitri)
---
 src/tiffvisitor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index aa17474..c07e3e3 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -36,8 +36,8 @@ EXIV2_RCSID("@(#) $Id$")
 # include "exv_conf.h"
 #endif
 
-#include "tiffvisitor.hpp"
-#include "tiffcomposite.hpp"
+#include "tiffcomposite.hpp"  // Do not change the order of these 2 includes,
+#include "tiffvisitor.hpp"    // see bug #487
 #include "tiffparser.hpp"
 #include "makernote2.hpp"
 #include "exif.hpp"

-- 
exiv2 packaging