From 8746b63ff7aa254dc9f78469836861aa576e7d45 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 26 Apr 2012 01:29:00 +0000 Subject: [PATCH] Typo fix, and add some missing methods. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/image.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/interface/wx/image.h b/interface/wx/image.h index de1676a55f..864624d1dd 100644 --- a/interface/wx/image.h +++ b/interface/wx/image.h @@ -335,6 +335,24 @@ public: @since 2.9.2 */ static wxVersionInfo GetLibraryVersionInfo(); + +protected: + /** + Called to get the number of images available in a multi-image file + type, if supported. + + NOTE: this function is allowed to change the current stream position + since GetImageCount() will take care of restoring it later + */ + virtual int DoGetImageCount( wxInputStream& stream ); + + /** + Called to test if this handler can read an image from the given stream. + + NOTE: this function is allowed to change the current stream position + since CallDoCanRead() will take care of restoring it later + */ + virtual bool DoCanRead( wxInputStream& stream ) = 0; }; @@ -1077,7 +1095,7 @@ public: This is most often used when doing direct image manipulation. The return value points to an array of characters in RGBRGBRGB... format in the top-to-bottom, left-to-right order, that is the first RGB triplet - corresponds to the pixel first pixel of the first row, the second one --- + corresponds to the first pixel of the first row, the second one --- to the second pixel of the first row and so on until the end of the first row, with second row following after it and so on. -- 2.45.2