[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/digikam/libs
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2009-10-06 19:20:50
Message-ID: 1254856850.481394.30439.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1032069 by cgilles:
fix compilation with debug.h
M +1 -1 dimg/dimg.cpp
M +1 -1 dimg/loaders/dimgloader.cpp
M +2 -2 dimg/loaders/jp2kloader.cpp
M +1 -1 dimg/loaders/jp2kloader.h
M +2 -3 dimg/loaders/jpegloader.cpp
M +1 -1 dimg/loaders/jpegloader.h
M +1 -1 dimg/loaders/pgfloader.cpp
M +1 -1 dimg/loaders/pngloader.cpp
M +1 -1 dimg/loaders/ppmloader.cpp
M +1 -1 dimg/loaders/rawloader.cpp
M +1 -1 dimg/loaders/tiffloader.cpp
M +1 -1 dmetadata/dmetadata.cpp
M +0 -2 dmetadata/template.cpp
--- trunk/extragear/graphics/digikam/libs/dimg/dimg.cpp #1032068:1032069
@@ -61,6 +61,7 @@
// Local includes
+#include "debug.h"
#include "pngloader.h"
#include "jpegloader.h"
#include "tiffloader.h"
@@ -73,7 +74,6 @@
#include "exposurecontainer.h"
#include "dmetadata.h"
#include "dimgloaderobserver.h"
-#include "debug.h"
typedef uint64_t ullong;
typedef int64_t llong;
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/dimgloader.cpp #1032068:1032069
@@ -35,10 +35,10 @@
// Local includes
+#include "debug.h"
#include "dimg_p.h"
#include "dmetadata.h"
#include "dimgloaderobserver.h"
-#include "debug.h"
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/jp2kloader.cpp #1032068:1032069
@@ -6,7 +6,7 @@
* Date : 2006-06-14
* Description : A JPEG2000 IO file for DImg framework
*
- * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2006-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This implementation use Jasper API
* library : http://www.ece.uvic.ca/~mdadams/jasper
@@ -44,10 +44,10 @@
// Local includes
+#include "debug.h"
#include "dimg.h"
#include "dimgloaderobserver.h"
#include "jp2kloader.h"
-#include "debug.h"
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/jp2kloader.h #1032068:1032069
@@ -6,7 +6,7 @@
* Date : 2006-06-14
* Description : A JPEG2000 IO file for DImg framework
*
- * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2006-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/jpegloader.cpp #1032068:1032069
@@ -7,7 +7,7 @@
* Description : A JPEG IO file for DImg framework
*
* Copyright (C) 2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu>
- * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2005-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -38,7 +38,6 @@
#include "iccjpeg.h"
}
-
// Qt includes
#include <QFile>
@@ -46,9 +45,9 @@
// Local includes
+#include "debug.h"
#include "dimg.h"
#include "dimgloaderobserver.h"
-#include "debug.h"
#ifdef Q_CC_MSVC
#include "jpegwin.h"
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/jpegloader.h #1032068:1032069
@@ -7,7 +7,7 @@
* Description : A JPEG IO file for DImg framework
*
* Copyright (C) 2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu>, Gilles Caulier
- * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2005-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/pgfloader.cpp #1032068:1032069
@@ -71,10 +71,10 @@
// Local includes
+#include "debug.h"
#include "PGFimage.h"
#include "dimg.h"
#include "dimgloaderobserver.h"
-#include "debug.h"
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/pngloader.cpp #1032068:1032069
@@ -54,10 +54,10 @@
// Local includes
+#include "debug.h"
#include "version.h"
#include "dimg.h"
#include "dimgloaderobserver.h"
-#include "debug.h"
#ifdef Q_CC_MSVC
void _ReadProc(struct png_struct_def *png_ptr, unsigned char *data, unsigned int size)
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/ppmloader.cpp #1032068:1032069
@@ -50,9 +50,9 @@
// Local includes
+#include "debug.h"
#include "dimg.h"
#include "dimgloaderobserver.h"
-#include "debug.h"
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/rawloader.cpp #1032068:1032069
@@ -41,6 +41,7 @@
// Local includes
+#include "debug.h"
#include "dimg.h"
#include "dimgloaderobserver.h"
#include "icctransform.h"
@@ -49,7 +50,6 @@
#include "imagelevels.h"
#include "bcgmodifier.h"
#include "whitebalance.h"
-#include "debug.h"
#include "globals.h"
namespace Digikam
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/tiffloader.cpp #1032068:1032069
@@ -61,11 +61,11 @@
// Local includes
+#include "debug.h"
#include "version.h"
#include "dimg.h"
#include "dimgloaderobserver.h"
#include "dmetadata.h"
-#include "debug.h"
#include "tiffloader.h" //krazy:exclude=includes
--- trunk/extragear/graphics/digikam/libs/dmetadata/dmetadata.cpp #1032068:1032069
@@ -49,9 +49,9 @@
// Local includes
+#include "debug.h"
#include "template.h"
#include "version.h"
-#include "debug.h"
#include "globals.h"
using namespace KExiv2Iface;
--- trunk/extragear/graphics/digikam/libs/dmetadata/template.cpp #1032068:1032069
@@ -25,8 +25,6 @@
// KDE includes
-
-
namespace Digikam
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic