From b84bb5da9991dbd39b5fc591c397158bdedc2646 Mon Sep 17 00:00:00 2001 From: Joseph Davies Date: Wed, 11 May 2011 17:02:14 -0700 Subject: [PATCH] Add Python function and glue for PNG saving. --- .../Plasma/FeatureLib/pfPython/pyImage.cpp | 7 ++++ Sources/Plasma/FeatureLib/pfPython/pyImage.h | 1 + .../FeatureLib/pfPython/pyImageGlue.cpp | 36 +++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp b/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp index d76c3072..9719ca2a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp @@ -160,6 +160,13 @@ void pyImage::SaveAsJPEG(const wchar* fileName, UInt8 quality) plJPEG::Instance().WriteToFile( fileName, this->GetImage() ); } +#include "plGImage/plPNG.h" +void pyImage::SaveAsPNG(const wchar* fileName) +{ + + plPNG::Instance().WriteToFile( fileName, this->GetImage() ); +} + #include "hsResMgr.h" #include "pnKeyedObject/plUoid.h" PyObject* pyImage::LoadJPEGFromDisk(const wchar* filename, UInt16 width, UInt16 height) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImage.h b/Sources/Plasma/FeatureLib/pfPython/pyImage.h index d19f7ec0..5c584da6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImage.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyImage.h @@ -150,6 +150,7 @@ public: UInt32 GetWidth(); // returns the width of the image UInt32 GetHeight(); // returns the height of the image void SaveAsJPEG(const wchar* fileName, UInt8 quality = 75); + void SaveAsPNG(const wchar* fileName); static PyObject* LoadJPEGFromDisk(const wchar* filename, UInt16 width, UInt16 height); // returns pyImage #endif }; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImageGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyImageGlue.cpp index bf93fe70..7d5e7a6a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImageGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyImageGlue.cpp @@ -158,6 +158,41 @@ PYTHON_METHOD_DEFINITION(ptImage, saveAsJPEG, args) PYTHON_RETURN_ERROR; } } + +PYTHON_METHOD_DEFINITION(ptImage, saveAsPNG, args) +{ + PyObject* filenameObj; + if (!PyArg_ParseTuple(args, "O", &filenameObj)) + { + PyErr_SetString(PyExc_TypeError, "saveAsPNG expects a string"); + PYTHON_RETURN_ERROR; + } + + if (PyUnicode_Check(filenameObj)) + { + int strLen = PyUnicode_GetSize(filenameObj); + wchar_t* text = TRACKED_NEW wchar_t[strLen + 1]; + PyUnicode_AsWideChar((PyUnicodeObject*)filenameObj, text, strLen); + text[strLen] = L'\0'; + self->fThis->SaveAsPNG(text); + delete [] text; + PYTHON_RETURN_NONE; + } + else if (PyString_Check(filenameObj)) + { + // we'll allow this, just in case something goes weird + char* text = PyString_AsString(filenameObj); + wchar_t* wText = hsStringToWString(text); + self->fThis->SaveAsPNG(wText); + delete [] wText; + PYTHON_RETURN_NONE; + } + else + { + PyErr_SetString(PyExc_TypeError, "saveAsPNG expects a string"); + PYTHON_RETURN_ERROR; + } +} #endif // BUILDING_PYPLASMA PYTHON_START_METHODS_TABLE(ptImage) @@ -167,6 +202,7 @@ PYTHON_START_METHODS_TABLE(ptImage) PYTHON_METHOD_NOARGS(ptImage, getWidth, "Returns the width of the image"), PYTHON_METHOD_NOARGS(ptImage, getHeight, "Returns the height of the image"), PYTHON_METHOD(ptImage, saveAsJPEG, "Params: filename,quality=75\nSaves this image to disk as a JPEG file"), + PYTHON_METHOD(ptImage, saveAsPNG, "Params: filename\nSaves this image to disk as a PNG file"), #endif PYTHON_END_METHODS_TABLE;