summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Figuiere <hub@figuiere.net>2010-03-10 20:43:10 -0800
committerHubert Figuiere <hub@figuiere.net>2010-03-10 20:43:10 -0800
commitfeacf9e58be6bec5384f90bc007a898091b4f4ed (patch)
tree463146b4497e6784bb555c55b0e10da30e0ead94
parente2b0cbb3aab58c026ec1080a782ddc9b6a3be13a (diff)
Rename debug.{h,cpp} to trace.{h,cpp}
-rw-r--r--lib/Makefile.am4
-rw-r--r--lib/arwfile.cpp2
-rw-r--r--lib/bitmapdata.cpp2
-rw-r--r--lib/capi/debug.cpp2
-rw-r--r--lib/ciffcontainer.cpp2
-rw-r--r--lib/ciffcontainer.h2
-rw-r--r--lib/cr2file.cpp2
-rw-r--r--lib/crwdecompressor.cpp2
-rw-r--r--lib/crwfile.cpp2
-rw-r--r--lib/dngfile.cpp2
-rw-r--r--lib/erffile.cpp2
-rw-r--r--lib/ifddir.cpp2
-rw-r--r--lib/ifddir.h2
-rw-r--r--lib/ifdfile.cpp2
-rw-r--r--lib/ifdfilecontainer.cpp2
-rw-r--r--lib/io/memstream.cpp2
-rw-r--r--lib/jfifcontainer.cpp2
-rw-r--r--lib/libopenraw.sym14
-rw-r--r--lib/ljpegdecompressor.cpp3
-rw-r--r--lib/metavalue.cpp2
-rw-r--r--lib/mrwcontainer.cpp2
-rw-r--r--lib/mrwfile.cpp2
-rw-r--r--lib/neffile.cpp2
-rw-r--r--lib/orfcontainer.cpp2
-rw-r--r--lib/orffile.cpp2
-rw-r--r--lib/peffile.cpp2
-rw-r--r--lib/rawcontainer.cpp2
-rw-r--r--lib/rawfile.cpp2
-rw-r--r--lib/rawfilefactory.cpp2
-rw-r--r--lib/thumbnail.cpp2
-rw-r--r--lib/trace.cpp (renamed from lib/debug.cpp)6
-rw-r--r--lib/trace.h (renamed from lib/debug.h)2
-rw-r--r--lib/unpack.cpp2
-rw-r--r--test/ciffcontainertest.cpp2
34 files changed, 43 insertions, 44 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 45c5125..03eace2 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = libopenraw.sym libopenraw-1.0.pc.in
pkgconfig_DATA = libopenraw-1.0.pc
noinst_HEADERS = or_debug.h \
- debug.h \
+ trace.h \
rawcontainer.h \
ifdfile.h tiffepfile.h \
rawfilefactory.h \
@@ -47,7 +47,7 @@ libopenraw_la_LDFLAGS = \
libopenraw_la_LIBADD = io/libio.la capi/libopenrawc.la -ljpeg
libopenraw_la_SOURCES = \
- debug.cpp \
+ trace.cpp \
bititerator.h \
bititerator.cpp \
huffman.h \
diff --git a/lib/arwfile.cpp b/lib/arwfile.cpp
index 9f373c6..1c7383b 100644
--- a/lib/arwfile.cpp
+++ b/lib/arwfile.cpp
@@ -22,7 +22,7 @@
#include <libopenraw/libopenraw.h>
#include <libopenraw++/thumbnail.h>
-#include "debug.h"
+#include "trace.h"
#include "io/file.h"
#include "ifdfilecontainer.h"
#include "ifd.h"
diff --git a/lib/bitmapdata.cpp b/lib/bitmapdata.cpp
index aa73807..b685105 100644
--- a/lib/bitmapdata.cpp
+++ b/lib/bitmapdata.cpp
@@ -23,7 +23,7 @@
#include <iostream>
#include <assert.h>
-#include "debug.h"
+#include "trace.h"
#include <libopenraw/libopenraw.h>
#include <libopenraw++/rawfile.h>
diff --git a/lib/capi/debug.cpp b/lib/capi/debug.cpp
index d71a216..6ba4dc1 100644
--- a/lib/capi/debug.cpp
+++ b/lib/capi/debug.cpp
@@ -24,7 +24,7 @@
#include <libopenraw/debug.h>
-#include "debug.h"
+#include "trace.h"
#ifdef __cplusplus
extern "C" {
diff --git a/lib/ciffcontainer.cpp b/lib/ciffcontainer.cpp
index 410c4bb..c548286 100644
--- a/lib/ciffcontainer.cpp
+++ b/lib/ciffcontainer.cpp
@@ -26,7 +26,7 @@
#include "io/file.h"
#include "ciffcontainer.h"
-#include "debug.h"
+#include "trace.h"
using namespace Debug;
diff --git a/lib/ciffcontainer.h b/lib/ciffcontainer.h
index 9312342..24e6c00 100644
--- a/lib/ciffcontainer.h
+++ b/lib/ciffcontainer.h
@@ -31,7 +31,7 @@
#include <boost/shared_ptr.hpp>
#include "rawcontainer.h"
-#include "debug.h"
+#include "trace.h"
namespace OpenRaw {
namespace Internals {
diff --git a/lib/cr2file.cpp b/lib/cr2file.cpp
index 4a1f0ef..bdf43df 100644
--- a/lib/cr2file.cpp
+++ b/lib/cr2file.cpp
@@ -25,7 +25,7 @@
#include <libopenraw++/thumbnail.h>
#include <libopenraw++/rawdata.h>
-#include "debug.h"
+#include "trace.h"
#include "io/file.h"
#include "io/memstream.h"
#include "ifdfilecontainer.h"
diff --git a/lib/crwdecompressor.cpp b/lib/crwdecompressor.cpp
index f514d5e..ff01d7c 100644
--- a/lib/crwdecompressor.cpp
+++ b/lib/crwdecompressor.cpp
@@ -33,7 +33,7 @@
#include <libopenraw++/rawdata.h>
#include "crwdecompressor.h"
-#include "debug.h"
+#include "trace.h"
#include "rawcontainer.h"
#include "io/stream.h"
#include "exception.h"
diff --git a/lib/crwfile.cpp b/lib/crwfile.cpp
index dd3a413..e256cc6 100644
--- a/lib/crwfile.cpp
+++ b/lib/crwfile.cpp
@@ -28,7 +28,7 @@
#include <libopenraw++/thumbnail.h>
#include <libopenraw++/rawdata.h>
-#include "debug.h"
+#include "trace.h"
#include "io/file.h"
#include "io/streamclone.h"
#include "io/memstream.h"
diff --git a/lib/dngfile.cpp b/lib/dngfile.cpp
index ed4bbd6..46c06ff 100644
--- a/lib/dngfile.cpp
+++ b/lib/dngfile.cpp
@@ -26,7 +26,7 @@
#include <boost/scoped_ptr.hpp>
-#include "debug.h"
+#include "trace.h"
#include "io/file.h"
#include "io/memstream.h"
#include "ifdfilecontainer.h"
diff --git a/lib/erffile.cpp b/lib/erffile.cpp
index ab5eab1..a12d9c7 100644
--- a/lib/erffile.cpp
+++ b/lib/erffile.cpp
@@ -23,7 +23,7 @@
#include <libopenraw++/thumbnail.h>
#include <libopenraw++/rawdata.h>
-#include "debug.h"
+#include "trace.h"
#include "ifd.h"
#include "ifdfilecontainer.h"
#include "ifddir.h"
diff --git a/lib/ifddir.cpp b/lib/ifddir.cpp
index 1ee82b5..ad90ccf 100644
--- a/lib/ifddir.cpp
+++ b/lib/ifddir.cpp
@@ -21,7 +21,7 @@
#include <libopenraw/types.h>
-#include "debug.h"
+#include "trace.h"
#include "exception.h"
#include "ifd.h"
#include "io/stream.h"
diff --git a/lib/ifddir.h b/lib/ifddir.h
index 4068a2f..a4a000f 100644
--- a/lib/ifddir.h
+++ b/lib/ifddir.h
@@ -27,7 +27,7 @@
#include <boost/config.hpp>
#include <boost/shared_ptr.hpp>
#include "ifdentry.h"
-#include "debug.h"
+#include "trace.h"
namespace OpenRaw {
namespace Internals {
diff --git a/lib/ifdfile.cpp b/lib/ifdfile.cpp
index ac346b0..f38a200 100644
--- a/lib/ifdfile.cpp
+++ b/lib/ifdfile.cpp
@@ -27,7 +27,7 @@
#include <libopenraw++/thumbnail.h>
#include <libopenraw++/rawdata.h>
-#include "debug.h"
+#include "trace.h"
#include "io/stream.h"
#include "io/streamclone.h"
#include "io/file.h"
diff --git a/lib/ifdfilecontainer.cpp b/lib/ifdfilecontainer.cpp
index 12220e9..6d35eea 100644
--- a/lib/ifdfilecontainer.cpp
+++ b/lib/ifdfilecontainer.cpp
@@ -25,7 +25,7 @@
#include <vector>
#include <iostream>
-#include "debug.h"
+#include "trace.h"
#include "ifdfilecontainer.h"
#include "io/file.h"
diff --git a/lib/io/memstream.cpp b/lib/io/memstream.cpp
index 85aad59..2d1feab 100644
--- a/lib/io/memstream.cpp
+++ b/lib/io/memstream.cpp
@@ -24,7 +24,7 @@
#include <libopenraw/libopenraw.h>
#include "memstream.h"
-#include "debug.h"
+#include "trace.h"
using namespace Debug;
diff --git a/lib/jfifcontainer.cpp b/lib/jfifcontainer.cpp
index a472260..efb3307 100644
--- a/lib/jfifcontainer.cpp
+++ b/lib/jfifcontainer.cpp
@@ -35,7 +35,7 @@ namespace JPEG {
#include <string.h>
#include <libopenraw++/bitmapdata.h>
#include "io/stream.h"
-#include "debug.h"
+#include "trace.h"
#include "jfifcontainer.h"
namespace OpenRaw {
diff --git a/lib/libopenraw.sym b/lib/libopenraw.sym
index 1486775..c45d04c 100644
--- a/lib/libopenraw.sym
+++ b/lib/libopenraw.sym
@@ -1,7 +1,7 @@
-or_get_extract_thumbnail
-or_thumbnail_data
-or_thumbnail_data_size
-or_thumbnail_format
-or_thumbnail_new
-or_thumbnail_release
-or_thumbnail_size
+_or_get_extract_thumbnail
+_or_thumbnail_data
+_or_thumbnail_data_size
+_or_thumbnail_format
+_or_thumbnail_new
+_or_thumbnail_release
+_or_thumbnail_dimensions
diff --git a/lib/ljpegdecompressor.cpp b/lib/ljpegdecompressor.cpp
index 6bec359..b176853 100644
--- a/lib/ljpegdecompressor.cpp
+++ b/lib/ljpegdecompressor.cpp
@@ -60,12 +60,11 @@
#include <libopenraw++/rawdata.h>
#include "io/memstream.h"
-#include "debug.h"
+#include "trace.h"
#include "rawcontainer.h"
#include "jfifcontainer.h"
#include "ljpegdecompressor.h"
#include "ljpegdecompressor_priv.h"
-#include "debug.h"
namespace OpenRaw {
diff --git a/lib/metavalue.cpp b/lib/metavalue.cpp
index cadef4e..ad5f491 100644
--- a/lib/metavalue.cpp
+++ b/lib/metavalue.cpp
@@ -20,7 +20,7 @@
*/
-#include "debug.h"
+#include "trace.h"
#include "exception.h"
#include "metavalue.h"
diff --git a/lib/mrwcontainer.cpp b/lib/mrwcontainer.cpp
index 4d863d0..5b26fb0 100644
--- a/lib/mrwcontainer.cpp
+++ b/lib/mrwcontainer.cpp
@@ -19,7 +19,7 @@
* <http://www.gnu.org/licenses/>.
*/
-#include "debug.h"
+#include "trace.h"
#include "mrwcontainer.h"
#include "io/file.h"
diff --git a/lib/mrwfile.cpp b/lib/mrwfile.cpp
index bcb24a6..432ede4 100644
--- a/lib/mrwfile.cpp
+++ b/lib/mrwfile.cpp
@@ -26,7 +26,7 @@
#include <libopenraw++/thumbnail.h>
#include <libopenraw++/rawdata.h>
-#include "debug.h"
+#include "trace.h"
#include "io/stream.h"
#include "io/file.h"
#include "mrwcontainer.h"
diff --git a/lib/neffile.cpp b/lib/neffile.cpp
index 4623933..b087192 100644
--- a/lib/neffile.cpp
+++ b/lib/neffile.cpp
@@ -27,7 +27,7 @@
#include <libopenraw++/thumbnail.h>
#include <libopenraw++/rawdata.h>
-#include "debug.h"
+#include "trace.h"
#include "ifd.h"
#include "ifdfilecontainer.h"
#include "ifddir.h"
diff --git a/lib/orfcontainer.cpp b/lib/orfcontainer.cpp
index 5cc91bb..f5c329f 100644
--- a/lib/orfcontainer.cpp
+++ b/lib/orfcontainer.cpp
@@ -19,7 +19,7 @@
*/
-#include "debug.h"
+#include "trace.h"
#include "orfcontainer.h"
diff --git a/lib/orffile.cpp b/lib/orffile.cpp
index a545ebc..96690cc 100644
--- a/lib/orffile.cpp
+++ b/lib/orffile.cpp
@@ -21,7 +21,7 @@
#include <libopenraw++/thumbnail.h>
#include <libopenraw++/rawdata.h>
-#include "debug.h"
+#include "trace.h"
#include "orffile.h"
#include "ifd.h"
#include "ifddir.h"
diff --git a/lib/peffile.cpp b/lib/peffile.cpp
index cef6b27..2456fd6 100644
--- a/lib/peffile.cpp
+++ b/lib/peffile.cpp
@@ -23,7 +23,7 @@
#include <libopenraw++/thumbnail.h>
#include <libopenraw++/rawdata.h>
-#include "debug.h"
+#include "trace.h"
#include "ifd.h"
#include "ifdfilecontainer.h"
#include "ifddir.h"
diff --git a/lib/rawcontainer.cpp b/lib/rawcontainer.cpp
index cbe4e8f..8798a59 100644
--- a/lib/rawcontainer.cpp
+++ b/lib/rawcontainer.cpp
@@ -22,7 +22,7 @@
#include <libopenraw/types.h>
-#include "debug.h"
+#include "trace.h"
#include "endianutils.h"
#include "io/file.h"
#include "rawcontainer.h"
diff --git a/lib/rawfile.cpp b/lib/rawfile.cpp
index 1754a8d..9e1ac6b 100644
--- a/lib/rawfile.cpp
+++ b/lib/rawfile.cpp
@@ -30,7 +30,7 @@
#include <boost/scoped_ptr.hpp>
#include <boost/checked_delete.hpp>
-#include "debug.h"
+#include "trace.h"
#include <libopenraw/metadata.h>
#include <libopenraw++/rawfile.h>
diff --git a/lib/rawfilefactory.cpp b/lib/rawfilefactory.cpp
index 5440865..247151e 100644
--- a/lib/rawfilefactory.cpp
+++ b/lib/rawfilefactory.cpp
@@ -24,7 +24,7 @@
#include <cassert>
#include "rawfilefactory.h"
-#include "debug.h"
+#include "trace.h"
using namespace Debug;
diff --git a/lib/thumbnail.cpp b/lib/thumbnail.cpp
index 8b475ba..591710a 100644
--- a/lib/thumbnail.cpp
+++ b/lib/thumbnail.cpp
@@ -22,7 +22,7 @@
#include <cstring>
#include <iostream>
-#include "debug.h"
+#include "trace.h"
#include <libopenraw/libopenraw.h>
#include <libopenraw++/rawfile.h>
diff --git a/lib/debug.cpp b/lib/trace.cpp
index 7ae09c0..1666473 100644
--- a/lib/debug.cpp
+++ b/lib/trace.cpp
@@ -1,7 +1,7 @@
/*
- * libopenraw - debug.cpp
+ * libopenraw - trace.cpp
*
- * Copyright (C) 2006-2007 Hubert Figuiere
+ * Copyright (C) 2006-2007, 2010 Hubert Figuiere
*
* This library is free software: you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,7 +21,7 @@
#include <iostream>
-#include "debug.h"
+#include "trace.h"
diff --git a/lib/debug.h b/lib/trace.h
index beb5780..a292a60 100644
--- a/lib/debug.h
+++ b/lib/trace.h
@@ -1,5 +1,5 @@
/*
- * libopenraw - debug.h
+ * libopenraw - trace.h
*
* Copyright (C) 2006-2007 Hubert Figuiere
*
diff --git a/lib/unpack.cpp b/lib/unpack.cpp
index 3ff59cf..a5155df 100644
--- a/lib/unpack.cpp
+++ b/lib/unpack.cpp
@@ -23,7 +23,7 @@
#include <assert.h>
#include "unpack.h"
-#include "debug.h"
+#include "trace.h"
#include "ifd.h"
namespace OpenRaw { namespace Internals {
diff --git a/test/ciffcontainertest.cpp b/test/ciffcontainertest.cpp
index b202349..40c647c 100644
--- a/test/ciffcontainertest.cpp
+++ b/test/ciffcontainertest.cpp
@@ -21,7 +21,7 @@
#include <iostream>
-#include "debug.h"
+#include "trace.h"
#include "ciffcontainer.h"
#include "io/file.h"