summaryrefslogtreecommitdiff
path: root/splash
diff options
context:
space:
mode:
authorOliver Sander <oliver.sander@tu-dresden.de>2018-12-02 21:02:51 +0100
committerAlbert Astals Cid <tsdgeos@yahoo.es>2019-03-21 22:28:13 +0000
commit9bc752c7fabe190987ae46ed28620b62cdff60e9 (patch)
tree0580e37fe3d829a4fe8ec7954239755fde685e04 /splash
parentfa8f3f22e85a5508fa53e8604b079e9b73e63f76 (diff)
Remove GooList completely
Diffstat (limited to 'splash')
-rw-r--r--splash/Splash.cc1
-rw-r--r--splash/SplashBitmap.cc5
-rw-r--r--splash/SplashBitmap.h6
3 files changed, 5 insertions, 7 deletions
diff --git a/splash/Splash.cc b/splash/Splash.cc
index 6be2477c..2ab79637 100644
--- a/splash/Splash.cc
+++ b/splash/Splash.cc
@@ -36,7 +36,6 @@
#include <math.h>
#include "goo/gmem.h"
#include "goo/GooLikely.h"
-#include "goo/GooList.h"
#include "poppler/Error.h"
#include "SplashErrorCodes.h"
#include "SplashMath.h"
diff --git a/splash/SplashBitmap.cc b/splash/SplashBitmap.cc
index 0afa3fcb..37e936c9 100644
--- a/splash/SplashBitmap.cc
+++ b/splash/SplashBitmap.cc
@@ -46,7 +46,6 @@
#include "goo/PNGWriter.h"
#include "goo/TiffWriter.h"
#include "goo/ImgWriter.h"
-#include "goo/GooList.h"
//------------------------------------------------------------------------
// SplashBitmap
@@ -54,7 +53,7 @@
SplashBitmap::SplashBitmap(int widthA, int heightA, int rowPadA,
SplashColorMode modeA, bool alphaA,
- bool topDown, GooList<GfxSeparationColorSpace*> *separationListA) {
+ bool topDown, std::vector<GfxSeparationColorSpace*> *separationListA) {
width = widthA;
height = heightA;
mode = modeA;
@@ -124,7 +123,7 @@ SplashBitmap::SplashBitmap(int widthA, int heightA, int rowPadA,
} else {
alpha = nullptr;
}
- separationList = new GooList<GfxSeparationColorSpace*>();
+ separationList = new std::vector<GfxSeparationColorSpace*>();
if (separationListA != nullptr)
for (std::size_t i = 0; i < separationListA->size(); i++)
separationList->push_back((GfxSeparationColorSpace*)( (*separationListA)[i])->copy());
diff --git a/splash/SplashBitmap.h b/splash/SplashBitmap.h
index 4ad9b628..fb066841 100644
--- a/splash/SplashBitmap.h
+++ b/splash/SplashBitmap.h
@@ -51,7 +51,7 @@ public:
// upside-down, i.e., with the last row first in memory.
SplashBitmap(int widthA, int heightA, int rowPad,
SplashColorMode modeA, bool alphaA,
- bool topDown = true, GooList<GfxSeparationColorSpace*> *separationList = nullptr);
+ bool topDown = true, std::vector<GfxSeparationColorSpace*> *separationList = nullptr);
static SplashBitmap *copy(SplashBitmap *src);
~SplashBitmap();
@@ -67,7 +67,7 @@ public:
SplashColorMode getMode() { return mode; }
SplashColorPtr getDataPtr() { return data; }
unsigned char *getAlphaPtr() { return alpha; }
- GooList<GfxSeparationColorSpace*> *getSeparationList() { return separationList; }
+ std::vector<GfxSeparationColorSpace*> *getSeparationList() { return separationList; }
SplashError writePNMFile(char *fileName);
SplashError writePNMFile(FILE *f);
@@ -117,7 +117,7 @@ private:
SplashColorPtr data; // pointer to row zero of the color data
unsigned char *alpha; // pointer to row zero of the alpha data
// (always top-down)
- GooList<GfxSeparationColorSpace*> *separationList; // list of spot colorants and their mapping functions
+ std::vector<GfxSeparationColorSpace*> *separationList; // list of spot colorants and their mapping functions
friend class Splash;