changed class names for driver tasks, cause it conflicts with the sam…

…e classed in pdfwriter. caused failure to incorprate image in form
galkahana · Jan 24, 2015 · cbbeafe · cbbeafe
1 parent 31794b6
commit cbbeafe
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hummus",
-  "version": "1.0.37",
+  "version": "1.0.38",
   "description": "Create, read and modify PDF files and streams",
   "main": "hummus",
   "scripts": {

diff --git a/src/PageContentContextDriver.cpp b/src/PageContentContextDriver.cpp
@@ -119,13 +119,13 @@ PDFWriterDriver* PageContentContextDriver::GetPDFWriter()
 }
 
 
-class PageImageWritingTask : public IPageEndWritingTask
+class PageContentImageWritingTask : public IPageEndWritingTask
 {
 public:
-    PageImageWritingTask(PDFWriterDriver* inDriver,const std::string& inImagePath,unsigned long inImageIndex,ObjectIDType inObjectID)
+    PageContentImageWritingTask(PDFWriterDriver* inDriver,const std::string& inImagePath,unsigned long inImageIndex,ObjectIDType inObjectID)
     {mDriver = inDriver;mImagePath = inImagePath;mImageIndex = inImageIndex;mObjectID = inObjectID;}
 
-    virtual ~PageImageWritingTask(){}
+    virtual ~PageContentImageWritingTask(){}
 
     virtual PDFHummus::EStatusCode Write(PDFPage* inPageObject,
                                          ObjectsContext* inObjectsContext,
@@ -146,6 +146,6 @@ void PageContentContextDriver::ScheduleImageWrite(const std::string& inImagePath
 {
     mPDFWriterDriver->GetWriter()->GetDocumentContext().RegisterPageEndWritingTask(
                                                                                    ContentContext->GetAssociatedPage(),
-                                                                                   new PageImageWritingTask(mPDFWriterDriver,inImagePath,inImageIndex,inObjectID));
+                                                                                   new PageContentImageWritingTask(mPDFWriterDriver,inImagePath,inImageIndex,inObjectID));
 
 }
diff --git a/src/XObjectContentContextDriver.cpp b/src/XObjectContentContextDriver.cpp
@@ -82,13 +82,13 @@ PDFWriterDriver* XObjectContentContextDriver::GetPDFWriter()
     return mPDFWriterDriver;
 }
 
- class FormImageWritingTask : public IFormEndWritingTask
+ class XObjectFormImageWritingTask : public IFormEndWritingTask
  {
  public:
- FormImageWritingTask(PDFWriterDriver* inDriver,const std::string& inImagePath,unsigned long inImageIndex,ObjectIDType inObjectID)
+ XObjectFormImageWritingTask(PDFWriterDriver* inDriver,const std::string& inImagePath,unsigned long inImageIndex,ObjectIDType inObjectID)
  {mDriver = inDriver;mImagePath = inImagePath;mImageIndex = inImageIndex;mObjectID = inObjectID;}
 
- virtual ~FormImageWritingTask(){}
+ virtual ~XObjectFormImageWritingTask(){}
 
      virtual PDFHummus::EStatusCode Write(PDFFormXObject* inFormXObject,
                                         ObjectsContext* inObjectsContext,
@@ -109,7 +109,7 @@ void XObjectContentContextDriver::ScheduleImageWrite(const std::string& inImageP
 {
     mPDFWriterDriver->GetWriter()->GetDocumentContext().RegisterFormEndWritingTask(
                                                             FormOfContext,
-                                                            new FormImageWritingTask(mPDFWriterDriver,inImagePath,inImageIndex,inObjectID));
+                                                            new XObjectFormImageWritingTask(mPDFWriterDriver,inImagePath,inImageIndex,inObjectID));
 
 }