From 080d202c75f0c0887d11daf5186ee51c1e82b6c3 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Thu, 10 Sep 2009 16:21:55 +0000 Subject: New iostream-style diamond inheritance pattern for FILE_Cookie: iFILE_Cookie, oFILE_Cookie, ioFILE_Cookie. --- libdimensionxx/png.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libdimensionxx/png.cpp') diff --git a/libdimensionxx/png.cpp b/libdimensionxx/png.cpp index 8853c5b..92bfc15 100644 --- a/libdimensionxx/png.cpp +++ b/libdimensionxx/png.cpp @@ -55,7 +55,7 @@ namespace Dimension } // Make the C++/C I/O interface - FILE_Cookie cookie(*m_ostr); + oFILE_Cookie cookie(*m_ostr); // Write the PNG file if (dmnsn_png_write_canvas(m_canvas->dmnsn(), cookie.file()) != 0) { @@ -81,7 +81,7 @@ namespace Dimension Persister persister; // Make the C++/C I/O interface - FILE_Cookie* cookie = new FILE_Cookie(*m_ostr); + FILE_Cookie* cookie = new oFILE_Cookie(*m_ostr); persister.persist(cookie); // Start the asynchronous task @@ -110,7 +110,7 @@ namespace Dimension } // Make the C++/C I/O interface - FILE_Cookie cookie(*m_istr); + iFILE_Cookie cookie(*m_istr); // Read the canvas from a PNG file dmnsn_canvas* canvas = dmnsn_png_read_canvas(cookie.file()); @@ -146,7 +146,7 @@ namespace Dimension persister.persist(canvas); // Make the C++/C I/O interface - FILE_Cookie* cookie = new FILE_Cookie(*m_istr); + iFILE_Cookie* cookie = new iFILE_Cookie(*m_istr); persister.persist(cookie); // Start the asynchronous task -- cgit v1.2.3