[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=026b821

The following commit has been merged in the master branch:
commit 026b821dd4b7ebcc0b39dc82d35dff4628170a8d
Author: Abhinav Badola <mail.abu.to at gmail.com>
Date:   Tue Oct 23 20:44:20 2012 +0000

    Make Build Test Succesful for Video Files
---
 Makefile               | 15 ++++++++++-----
 src/asfvideo.cpp       |  1 -
 src/quicktimevideo.cpp |  7 +++----
 src/riffvideo.cpp      | 12 ++++++------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index d4be5f9..e60408d 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ ENABLE_XMP = 1
 
 .PHONY: all doc config samples xmpsdk                \
         mostlyclean clean distclean maintainer-clean \
-        install uninstall
+        install uninstall tests teste testv
 
 all install: config/config.mk xmpsdk
 	cd src && $(MAKE) $(MAKECMDGOALS)
@@ -70,12 +70,18 @@ doc: config/config.mk
 samples: config/config.mk
 	cd samples && $(MAKE) $(MAKECMDGOALS)
 
-config:
-	cd config && $(MAKE) -f config.make $(MAKECMDGOALS)
-	
 tests:
 	cd test && $(MAKE) test
 
+teste:
+	cd test && $(MAKE) teste
+
+testv:
+	cd test && $(MAKE) testv
+
+config:
+	cd config && $(MAKE) -f config.make $(MAKECMDGOALS)
+
 xmpsdk: config/config.mk
 	if test "x$(ENABLE_XMP)" = "x1"; then cd xmpsdk/src && $(MAKE) $@; fi;
 
@@ -92,7 +98,6 @@ mostlyclean clean: config/config.mk
 # for packaging.
 distclean: clean
 	rm -f config.log config.status libtool
-	rm -f bin
 	rm -f *~ *.bak *#
 
 # This removes almost everything, including the configure script!
diff --git a/src/asfvideo.cpp b/src/asfvideo.cpp
index fecb5a2..3d23512 100644
--- a/src/asfvideo.cpp
+++ b/src/asfvideo.cpp
@@ -359,7 +359,6 @@ namespace Exiv2 {
         size = static_cast<unsigned long>(getUint64_t(buf));
 
         if(tv) {
-            std::cerr<<"
"<<std::setw(40)<<tv->label_<<"=>"<<std::setw(5)<<size;
             tagDecoder(tv,size-24);
         }
         else
diff --git a/src/quicktimevideo.cpp b/src/quicktimevideo.cpp
index 0b82b5e..7e92d14 100644
--- a/src/quicktimevideo.cpp
+++ b/src/quicktimevideo.cpp
@@ -649,7 +649,7 @@ namespace Exiv2 {
 
     void QuickTimeVideo::decodeBlock()
     {
-        const long bufMinSize = 5;
+        const long bufMinSize = 4;
         DataBuf buf(bufMinSize);
         unsigned long size = 0;
         buf.pData_[4] = '

-- 
exiv2 packaging