[poppler] goo/gfile.h goo/GooHash.h goo/GooList.h goo/PNGWriter.h goo/TiffWriter.h

[Albert Astals Cid]

 goo/GooHash.h    |   16 ++++++++++++++++
 goo/GooList.h    |   16 ++++++++++++++++
 goo/PNGWriter.h  |    5 ++++-
 goo/TiffWriter.h |    5 ++++-
 goo/gfile.h      |    4 ++++
 5 files changed, 44 insertions(+), 2 deletions(-)

New commits:
commit c35d030472e6cb140c3dff30b91541772c992eb0
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Dec 8 23:51:59 2012 +0100

    Add private copy constructor and operator= to make sure we don't use the default ones
    
    Since using them would results in bad things happening

diff --git a/goo/GooHash.h b/goo/GooHash.h
index b973a93..eda19e3 100644
--- a/goo/GooHash.h
+++ b/goo/GooHash.h
@@ -6,6 +6,20 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2012 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef GHASH_H
 #define GHASH_H
 
@@ -45,6 +59,8 @@ public:
   void killIter(GooHashIter **iter);
 
 private:
+  GooHash(const GooHash &other);
+  GooHash& operator=(const GooHash &other);
 
   void expand();
   GooHashBucket *find(GooString *key, int *h);
diff --git a/goo/GooList.h b/goo/GooList.h
index 964568a..c83a0e3 100644
--- a/goo/GooList.h
+++ b/goo/GooList.h
@@ -6,6 +6,20 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2012 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef GLIST_H
 #define GLIST_H
 
@@ -79,6 +93,8 @@ public:
   void setAllocIncr(int incA) { inc = incA; }
 
 private:
+  GooList(const GooList &other);
+  GooList& operator=(const GooList &other);
 
   void expand();
   void shrink();
diff --git a/goo/PNGWriter.h b/goo/PNGWriter.h
index 37df427..dc905d7 100644
--- a/goo/PNGWriter.h
+++ b/goo/PNGWriter.h
@@ -6,7 +6,7 @@
 //
 // Copyright (C) 2009 Warren Toomey <wkt at tuhs.org>
 // Copyright (C) 2009 Shen Liang <shenzhuxi at gmail.com>
-// Copyright (C) 2009, 2011 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2009, 2011, 2012 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2009 Stefan Thomas <thomas at eload24.com>
 // Copyright (C) 2010, 2011 Adrian Johnson <ajohnson at redneon.com>
 //
@@ -49,6 +49,9 @@ public:
   bool close();
 
 private:
+  PNGWriter(const PNGWriter &other);
+  PNGWriter& operator=(const PNGWriter &other);
+
   Format format;
   png_structp png_ptr;
   png_infop info_ptr;
diff --git a/goo/TiffWriter.h b/goo/TiffWriter.h
index 0265c07..848a24d 100644
--- a/goo/TiffWriter.h
+++ b/goo/TiffWriter.h
@@ -5,7 +5,7 @@
 // This file is licensed under the GPLv2 or later
 //
 // Copyright (C) 2010, 2012 William Bader <williambader at hotmail.com>
-// Copyright (C) 2011 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2011, 2012 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
 //
 //========================================================================
@@ -51,6 +51,9 @@ public:
   bool close();
 
 private:
+  TiffWriter(const TiffWriter &other);
+  TiffWriter& operator=(const TiffWriter &other);
+  
   TIFF *f;				// LibTiff file context
   int numRows;				// number of rows in the image
   int curRow;				// number of rows written
diff --git a/goo/gfile.h b/goo/gfile.h
index cefd679..4e11023 100644
--- a/goo/gfile.h
+++ b/goo/gfile.h
@@ -128,6 +128,8 @@ public:
   GBool isDir() { return dir; }
 
 private:
+  GDirEntry(const GDirEntry &other);
+  GDirEntry& operator=(const GDirEntry &other);
 
   GooString *name;		// dir/file name
   GooString *fullPath;
@@ -143,6 +145,8 @@ public:
   void rewind();
 
 private:
+  GDir(const GDir &other);
+  GDir& operator=(const GDir &other);
 
   GooString *path;		// directory path
   GBool doStat;			// call stat() for each entry?