From c35d5af1c2845ad072525e69f3f7be01994bcc2f Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sun, 4 Oct 2009 19:04:59 +0000 Subject: Purge test suite and C++ wrapper - for now. --- libdimensionxx/png.cpp | 180 ------------------------------------------------- 1 file changed, 180 deletions(-) delete mode 100644 libdimensionxx/png.cpp (limited to 'libdimensionxx/png.cpp') diff --git a/libdimensionxx/png.cpp b/libdimensionxx/png.cpp deleted file mode 100644 index 92bfc15..0000000 --- a/libdimensionxx/png.cpp +++ /dev/null @@ -1,180 +0,0 @@ -/************************************************************************* - * Copyright (C) 2009 Tavian Barnes * - * * - * This file is part of The Dimension Library. * - * * - * The Dimension Library is free software; you can redistribute it and/ * - * or modify it under the terms of the GNU Lesser General Public License * - * as published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - * The Dimension Library is distributed in the hope that it will be * - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this program. If not, see * - * . * - *************************************************************************/ - -#include "dimensionxx.hpp" -#include - -namespace Dimension -{ - PNG_Writer::PNG_Writer(Canvas& canvas, std::ostream& ostr) - : m_canvas(&canvas), m_ostr(&ostr), m_written(false) - { - // Optimize the canvas for PNG export - dmnsn_png_optimize_canvas(m_canvas->dmnsn()); - } - - // PNG_Writer destructor. Call write() to write the PNG file if not already - // written, but catch any exceptions and instead report the error with - // dmnsn_error() to avoid throwing from a destructor. - PNG_Writer::~PNG_Writer() - { - if (!m_written) { - try { - write(); - } catch (...) { - dmnsn_error(SEVERITY_MEDIUM, - "Writing canvas to PNG failed in PNG_Writer destructor."); - } - } - } - - // Write the PNG file. Uses the FILE_Cookie() interface to make a FILE* - // corresponding to an std::ostream (including std::ostringstream, etc). - void PNG_Writer::write() - { - if (m_written) { - // Does writing a PNG file twice make sense? - throw Dimension_Error("Attempt to write canvas to PNG twice."); - } - - // Make the C++/C I/O interface - oFILE_Cookie cookie(*m_ostr); - - // Write the PNG file - if (dmnsn_png_write_canvas(m_canvas->dmnsn(), cookie.file()) != 0) { - // The actual write operation failed, for some reason - throw Dimension_Error("Writing canvas to PNG failed."); - } - - m_written = true; // We've written the file now, don't do it again - } - - // Write a PNG file in the background - Progress - PNG_Writer::write_async() - { - if (m_written) { - // Does writing a PNG file twice make sense? - throw Dimension_Error("Attempt to write canvas to PNG twice."); - } - - m_written = true; // We've written the file now, don't do it again - - // Object to persist local variables past function return - Persister persister; - - // Make the C++/C I/O interface - FILE_Cookie* cookie = new oFILE_Cookie(*m_ostr); - persister.persist(cookie); - - // Start the asynchronous task - dmnsn_progress *progress - = dmnsn_png_write_canvas_async(m_canvas->dmnsn(), cookie->file()); - if (!progress) { - throw Dimension_Error("Starting background PNG write failed."); - } - - // Return the Progress object - return Progress(progress, persister); - } - - // Construct a PNG reader - PNG_Reader::PNG_Reader(std::istream& istr) - : m_istr(&istr), m_read(false) { } - - // Read a canvas from a PNG file. Uses the FILE_Cookie() interface to make a - // FILE* corresponding to an std::istream - Canvas - PNG_Reader::read() - { - if (m_read) { - // Does reading a PNG file twice make sense? - throw Dimension_Error("Attempt to read canvas from PNG twice."); - } - - // Make the C++/C I/O interface - iFILE_Cookie cookie(*m_istr); - - // Read the canvas from a PNG file - dmnsn_canvas* canvas = dmnsn_png_read_canvas(cookie.file()); - if (!canvas) { - // The read operation failed - throw Dimension_Error("Reading canvas from PNG failed."); - } - - // Only set m_read if nothing threw an exception - Canvas ret(canvas); - m_read = true; - return ret; - } - - // Read a PNG file in the background - Progress - PNG_Reader::read_async() - { - if (m_read) { - // Does reading a PNG file twice make sense? - throw Dimension_Error("Attempt to read canvas from PNG twice."); - } - - // Don't read again - m_read = true; - - // Object to persist local variables past function return - Persister persister; - - // Store a pointer to a dmnsn_canvas* in the persister to later construct - // the PNG_Writer - dmnsn_canvas** canvas = new dmnsn_canvas*; - persister.persist(canvas); - - // Make the C++/C I/O interface - iFILE_Cookie* cookie = new iFILE_Cookie(*m_istr); - persister.persist(cookie); - - // Start the asynchronous task - dmnsn_progress *progress - = dmnsn_png_read_canvas_async(canvas, cookie->file()); - if (!progress) { - throw Dimension_Error("Starting background PNG read failed."); - } - - // Return the Progress object - return Progress(progress, persister); - } - - // Construct an input PNG_Writer from a background task - Canvas - PNG_Reader::finish(Progress& progress) - { - // Will throw if progress is not from a PNG_Writer::read_async call - dmnsn_canvas** canvas - = progress.persister().first().persisted(); - - try { - progress.finish(); - } catch (...) { - dmnsn_delete_canvas(*canvas); - throw; - } - - return Canvas(*canvas); - } -} -- cgit v1.2.3