Update

plutoprint · May 23, 2024 · 0413b10 · 0413b10
1 parent e052076
commit 0413b10
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 13 deletions.
diff --git a/include/plutobook.h b/include/plutobook.h
@@ -176,7 +176,8 @@ typedef enum _plutobook_status {
     PLUTOBOOK_STATUS_SUCCESS = 0,
     PLUTOBOOK_STATUS_MEMORY_ERROR = 1,
     PLUTOBOOK_STATUS_LOAD_ERROR = 10,
-    PLUTOBOOK_STATUS_WRITE_ERROR = 11
+    PLUTOBOOK_STATUS_WRITE_ERROR = 11,
+    PLUTOBOOK_STATUS_CANVAS_ERROR = 12
 } plutobook_status_t;
 
 typedef plutobook_status_t (*plutobook_stream_write_callback_t)(void* closure, const char* data, unsigned int length);
@@ -198,6 +199,7 @@ PLUTOBOOK_API void plutobook_canvas_save_state(plutobook_canvas_t* canvas);
 PLUTOBOOK_API void plutobook_canvas_restore_state(plutobook_canvas_t* canvas);
 PLUTOBOOK_API cairo_surface_t* plutobook_canvas_get_surface(const plutobook_canvas_t* canvas);
 PLUTOBOOK_API cairo_t* plutobook_canvas_get_context(const plutobook_canvas_t* canvas);
+PLUTOBOOK_API plutobook_status_t plutobook_canvas_get_status(const plutobook_canvas_t* canvas);
 
 typedef enum _plutobook_image_format {
     PLUTOBOOK_IMAGE_FORMAT_INVALID = -1,

diff --git a/include/plutobook.hpp b/include/plutobook.hpp
@@ -306,12 +306,6 @@ class PLUTOBOOK_API Canvas {
      */
     void restoreState();
 
-    /**
-     * @brief Checks if the canvas is null.
-     * return true if the canvas is null (i.e., invalid), false otherwise.
-     */
-    bool isNull() const { return !m_canvas; }
-
     /**
      * @brief surface
      * @return
@@ -330,6 +324,18 @@ class PLUTOBOOK_API Canvas {
      */
     plutobook_canvas_t* canvas() const { return m_canvas; }
 
+    /**
+     * @brief isNull
+     * @return
+     */
+    bool isNull() const { return !m_canvas; }
+
+    /**
+     * @brief isGood
+     * @return
+     */
+    bool isGood() const;
+
 protected:
     Canvas(const Canvas&) = delete;
     Canvas& operator=(const Canvas&) = delete;

diff --git a/source/plutobook.cc b/source/plutobook.cc
@@ -140,6 +140,13 @@ cairo_t* plutobook_canvas_get_context(const plutobook_canvas_t* canvas)
     return canvas->context;
 }
 
+plutobook_status_t plutobook_canvas_get_status(const plutobook_canvas_t* canvas)
+{
+    if(canvas == nullptr || cairo_status(canvas->context) || cairo_surface_status(canvas->surface))
+        return PLUTOBOOK_STATUS_CANVAS_ERROR;
+    return PLUTOBOOK_STATUS_SUCCESS;
+}
+
 plutobook_canvas_t* plutobook_image_canvas_create(int width, int height, plutobook_image_format_t format)
 {
     return plutobook_canvas_create(cairo_image_surface_create((cairo_format_t)(format), width, height));
@@ -188,7 +195,7 @@ int plutobook_image_canvas_get_stride(const plutobook_canvas_t* canvas)
 plutobook_status_t plutobook_image_canvas_write_to_png(const plutobook_canvas_t* canvas, const char* filename)
 {
     if(canvas == nullptr)
-        return PLUTOBOOK_STATUS_MEMORY_ERROR;
+        return PLUTOBOOK_STATUS_WRITE_ERROR;
     if(cairo_surface_write_to_png(canvas->surface, filename))
         return PLUTOBOOK_STATUS_WRITE_ERROR;
     return PLUTOBOOK_STATUS_SUCCESS;
@@ -197,7 +204,7 @@ plutobook_status_t plutobook_image_canvas_write_to_png(const plutobook_canvas_t*
 plutobook_status_t plutobook_image_canvas_write_to_png_stream(const plutobook_canvas_t* canvas, plutobook_stream_write_callback_t callback, void* closure)
 {
     if(canvas == nullptr)
-        return PLUTOBOOK_STATUS_MEMORY_ERROR;
+        return PLUTOBOOK_STATUS_WRITE_ERROR;
     if(cairo_surface_write_to_png_stream(canvas->surface, (cairo_write_func_t)(callback), closure))
         return PLUTOBOOK_STATUS_WRITE_ERROR;
     return PLUTOBOOK_STATUS_SUCCESS;

diff --git a/source/plutobook.cpp b/source/plutobook.cpp
@@ -104,6 +104,11 @@ cairo_t* Canvas::context() const
     return plutobook_canvas_get_context(m_canvas);
 }
 
+bool Canvas::isGood() const
+{
+    return plutobook_canvas_get_status(m_canvas) == PLUTOBOOK_STATUS_SUCCESS;
+}
+
 ImageCanvas::ImageCanvas(int width, int height, ImageFormat format)
     : Canvas(plutobook_image_canvas_create(width, height, (plutobook_image_format_t)(format)))
 {
@@ -440,13 +445,15 @@ bool Book::writeToPdf(plutobook_stream_write_callback_t callback, void* closure,
     canvas.setKeywords(m_keywords);
     canvas.setCreationDate(m_creationDate);
     canvas.setModificationDate(m_modificationDate);
-    for(auto pageIndex = fromPage - 1; pageStep > 0 ? pageIndex < toPage : pageIndex > toPage; pageIndex += pageStep) {
-        canvas.setPageSize(pageSizeAt(pageIndex));
-        renderPage(canvas, pageIndex);
+    for(auto pageIndex = fromPage; pageStep > 0 ? pageIndex <= toPage : pageIndex >= toPage; pageIndex += pageStep) {
+        if(!canvas.isGood())
+            break;
+        canvas.setPageSize(pageSizeAt(pageIndex - 1));
+        renderPage(canvas, pageIndex - 1);
         canvas.showPage();
     }
 
-    return true;
+    return canvas.isGood();
 }
 
 bool Book::writeToPng(const std::string& filename, ImageFormat format) const