Commit Graph

76 Commits

Author SHA1 Message Date
Václav Slavík
b254d1fe03 mark wxImage's wxBitmap functions as deprecated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 22:49:50 +00:00
Vadim Zeitlin
dac7d53a83 added semicolons after HASH_MAP macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 02:28:02 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Gilles Depeyrot
af49c4b8a2 disable use of #pragma interface under Mac OS X
GNU compiler included with Mac OS X 10.2 (Jaguar) as well as August Developer
Tools update contain a bug concerning #pragma interface handling that can only
be worked around by not using them (and they are not necessary anyways)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-31 11:29:13 +00:00
Vadim Zeitlin
554726912a ixed compilation for wxUSE_STREAMS == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-23 21:23:10 +00:00
Vadim Zeitlin
39d16996b7 restore the stream position in wxImageHandler itself instead of forcing all
derived classes to do it themselves


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-22 23:14:47 +00:00
Gilles Depeyrot
d84afea9d1 corrected warnings when compiling with -Wall -W
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-07 21:58:27 +00:00
Václav Slavík
17483066d2 cleaning up the mess created by the FloodFill patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-07 23:05:49 +00:00
Julian Smart
b1699cd397 Applied FloodFill patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-01 21:40:42 +00:00
Václav Slavík
ef8f37e0db surround deprecated wxImage methods in WXWIN_COMPATIBILITY_2_2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-25 23:25:53 +00:00
Václav Slavík
45647dcf10 Chris' wxImage::SaveFile(filename_only) patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-17 11:35:32 +00:00
Václav Slavík
fd94e8aa45 A couple of changes to wxImage:
1. changed wxBMP_foo, wxCUR_foo to wxIMAGE_OPTION_{BMP,CUR}_foo
   (with backward compatiblity macros, of course)
2. applied Chris' patch to update hotspot when scaling an image
3. applied Chris' patch to write a filename in XPM and generalized it
   to pass wxIMAGE_OPTION_FILENAME to all saving handlers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-16 01:45:30 +00:00
Václav Slavík
e0a76d8d8a make more wxImage methods const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-08 00:17:25 +00:00
Václav Slavík
952ae1e88b changed wxImage::ComputeHistogram to use wxHashMap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-07 18:11:39 +00:00
Robert Roebling
4b6b4dfcf4 Added IFF handler.
Minor doc updates.
  Corrected configure for SGI OpenGL (wx-config related).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-15 17:57:08 +00:00
Václav Slavík
d394f4791d made wxImageHander's default values consistent with wxImage (doesn't matter, wxImage passes index explicitly)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-03 23:08:59 +00:00
Václav Slavík
649d13e837 fixing effects of my lack of English skills: GetImagesCount back to GetImageCount
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-02 17:09:43 +00:00
Václav Slavík
60d43ad883 support for multiple images in one file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-01 23:13:37 +00:00
Vadim Zeitlin
aaf46fd6fc compilation fixes for !wxUSE_STREAMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-30 22:26:15 +00:00
Václav Slavík
1f5b2017df fine-tuned API from the ICO patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-20 23:55:44 +00:00
Robert Roebling
52b64b0a78 Applied Chris' patch for support for ICO loading.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-18 09:43:06 +00:00
Vadim Zeitlin
d275c7eb84 added wxUSE_PALETTE and fixed compilation with it set to 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-30 22:06:39 +00:00
Václav Slavík
52f96deca1 removed wxImage::operator wxBitmap()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-16 22:07:39 +00:00
Václav Slavík
775c6f0cd2 added wxUSE_IMAGE; added write-only wxXPMHandler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 22:21:21 +00:00
Václav Slavík
f515c25a2c wxImage::ConvertToMono wasn't const - fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-06 22:15:34 +00:00
Václav Slavík
fd85921189 I moved platform specific code from wxImage to wxBitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-04 23:15:36 +00:00
Julian Smart
5e5437e00b Added Set/Get/HasOption members and moved palette to ref data class.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-29 11:44:57 +00:00
Julian Smart
3f4fc7967b Added wxQuantize, wxSplashScreen, wxEffects & added palette to wxImage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-28 17:53:25 +00:00
Bryan Petty
f6bcfd974e merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
Julian Smart
7a632f1056 Added rotation to wxImage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-06 14:51:36 +00:00
Robert Roebling
82ea63e6e0 Chnages to mono-bitmap code.
Added ConvertToMonoBitmap() to wxImage.
  Minor changes to forty.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-12 17:57:18 +00:00
Robert Roebling
be25e48093 Added mono bitmap to image conversion.
Added wxImage::Replace() (replaces one colour with another).
  Toolbar tips no longer eats ana new colour. This might prevent
    the wrong colour behaviour reported from some 8-bit visuals.
  Minor fixes and test code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-27 13:01:07 +00:00
Jouk Jansen
fb10f04c95 Committing in .
Patches for VMS

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/include/wx/image.h
 	wxWindows/src/common/datetime.cpp
 	wxWindows/src/common/descrip.mms
 	wxWindows/src/generic/descrip.mms
 	wxWindows/src/unix/threadpsx.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-23 13:19:09 +00:00
Václav Slavík
97734a7f33 fixed problem with image handlers in two headers (and yes, tested)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-17 20:19:19 +00:00
David Webster
97fdfcc9fd cleaning up image mess for os/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-17 05:42:26 +00:00
Vadim Zeitlin
6e807169c4 changed wxImage::Rescale() to return wxImage& and not void
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-16 23:13:23 +00:00
Vadim Zeitlin
d5e295970c compilation fix after incorrectly resolved conflict
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-16 21:59:02 +00:00
Vadim Zeitlin
8f177c8e73 Win16 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-16 21:29:54 +00:00
Guillermo Rodriguez Garcia
cc9f7d7939 Changed stopat to stopafter in CountColours
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-16 12:19:02 +00:00
Václav Slavík
8f49300284 image handlers moved to separate headers (imagbmp.h etc.) This change is backward compatible (all hdrs #included in image.h) and reduces executable size under GCC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-15 22:38:02 +00:00
Guillermo Rodriguez Garcia
89d0045628 Added CountColours()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-15 12:31:28 +00:00
Guillermo Rodriguez Garcia
c9d01afd82 Added ComputeHistogram
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-15 11:45:32 +00:00
Robert Roebling
700ec4546c Compile fix for GIF decoder,
Added image index to loadfile.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-30 17:24:14 +00:00
Robert Roebling
448dd031e3 TIFF code 1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-28 17:17:53 +00:00
Julian Smart
ac0ac8241f Fixed wxSlider95 bug; updated .dsp files; added Set/GetLastDirectory to wxDocManager
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-19 22:18:32 +00:00
Sylvain Bougnoux
87202f787c Add wxImage::CanRead, wasn't in 1.59 ?
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-18 14:18:15 +00:00
Vadim Zeitlin
936895ee9d compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-15 17:59:05 +00:00
Vadim Zeitlin
995612e2ab 1. wxImageHandler::DoCanRead() introduced to solve the virtual function name
hiding problem
2. wxPNMHandler::CanRead() shouldn't use wxT() - should it?


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-15 16:59:32 +00:00
Robin Dunn
a091d18c61 Added WXDLLEXPORT for wxInitAllImageHandlers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-09 21:16:45 +00:00
Sylvain Bougnoux
b5a4a47df5 change wxImage::InitAllHandlers to wxInitAllImageHandlers and put it in a separate file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-09-20 19:05:49 +00:00