Commit Graph

236 Commits

Author SHA1 Message Date
Robert Roebling
4ea56379e3 Added support for static (inlined) wxImages with
alpha channel.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 21:33:38 +00:00
Robert Roebling
6408deedee Added support for alpha channels in interpolated
and non-interpolated image rotation.
  Added helper method for turning shades of grey
    into shades of alpha and a colour.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 14:01:45 +00:00
Vadim Zeitlin
30984deafc new set of fixes for problems due to huge files support: drop wxFileSize_t, use wxFileOffset only, make wxInvalidOffset an int (main part of the patch 1063498)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 21:02:58 +00:00
Włodzimierz Skiba
1b941f2d31 Warning fixes for OpenWatcom.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 05:56:07 +00:00
Vadim Zeitlin
67c20e133e use wxFileSize_t instead of wxFileOffset or off_t
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 00:34:21 +00:00
Włodzimierz Skiba
7beb59f36c Source cleaning: whitespaces, tabs, -1/wxDefaultCoord/wxNOT_FOUND, TRUE/true, FALSE/false, !!/!IsEmpty().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 18:13:32 +00:00
Václav Slavík
e95f0d7986 removed warning-hiding cast, previous revision removed the warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-21 15:42:56 +00:00
Václav Slavík
8f2b21e474 threshold is pixel value, it should use unsigned char
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-21 11:54:31 +00:00
Włodzimierz Skiba
e567515efd Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-20 11:53:52 +00:00
Dimitri Schoolwerth
94406a493c MSVC6 return warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-16 15:32:07 +00:00
Václav Slavík
ff5ad79411 added wxImage::ConvertAlphaToMask
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-16 12:31:08 +00:00
Václav Slavík
bc88f66f5f minor polishing of user-visible messages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-16 11:32:51 +00:00
Vadim Zeitlin
5402d21de1 fixed delete[]/free mismatch in SetAlpha (part of patch 991168)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-30 23:18:10 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Dimitri Schoolwerth
d30ee785c2 made GetAlpha(x, y) const (the docs are already correct)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-15 16:16:01 +00:00
Vadim Zeitlin
999836aaca warning fixes for BCC and OW (heavily modified patch 819146)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 10:28:15 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:46:53 +00:00
Vadim Zeitlin
d8692f2b80 copy wxImage options when copying the images (replaces patch 780705)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 17:48:35 +00:00
Vadim Zeitlin
646c4aebb2 warning fixes (closes 767152)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 12:14:08 +00:00
Mattia Barbon
222ed1d678 STL-ification patch for wxMSW and wxGTK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 19:55:12 +00:00
Václav Slavík
d0ce3e528a compilation fix for wxBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 14:32:08 +00:00
Vadim Zeitlin
c631d59053 removed deprecated ConvertToBitmap() and wxImage(wxBitmap) ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 21:38:29 +00:00
Julian Smart
939fadc8aa Applied patch [ 710608 ] wxImage::GetImageExtWildcard for image load/save dialogs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 16:10:17 +00:00
Vadim Zeitlin
70cd62e95c TRUE/FALSE -> true/false
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 01:01:36 +00:00
Vadim Zeitlin
aaa9782834 wxImage::Create() should be bool, not void
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 00:59:42 +00:00
Vadim Zeitlin
edf8e8e071 memory for alpha channel was over allocated by a factor of 3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 23:52:20 +00:00
Julian Smart
ff865c132a Applied patch [ 730686 ] wxImage::Scale speed improvements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 15:06:07 +00:00
Vadim Zeitlin
487659e0fa added alpha channel support to wxImage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-03 20:33:40 +00:00
Stefan Csomor
c8ce283736 sorry previous commit message was wrong, should read
added shrink procedure with proper color averaging, it is triggered from scale in case the old with/height are multiples of the new width/height


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-03 15:35:52 +00:00
Stefan Csomor
fd9655adba overflow fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-03 15:30:20 +00:00
Mattia Barbon
ed39ff57b3 Remove unnecessary header dependencies. Fix resulting compilation
problems for wxMSW, wxGTK, wxMotif, wxX11 and wxMac in default
configuration. Non-default configurations will probably need some more
fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-10 21:07:36 +00:00
Ron Lee
b1d4dd7add Split this out from other changes to keep things sane..
wxDeprecated KeyCode.
wxDeprecated old wxList compat methods.
Replaced a large number of them in the gtk build already, but there are
still plenty more so feel free to help nuke them as you find them.
s/^I/    / and s/TRUE/true/ etc. a couple of these too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-13 05:17:41 +00:00
Vadim Zeitlin
22f3361e1c use DECLARE_NO_COPY_CLASS() where applicable (patch 633384)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 23:38:11 +00:00
Vadim Zeitlin
2c0a4e08a3 fixed VC++ warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 12:18:49 +00:00
Václav Slavík
1de1d24e96 removed XPM handler from wxImage's standard handlers, let's see if it does any harm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 21:03:25 +00:00
Václav Slavík
64e9f56b80 fixed Vadim's removal of XPM handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 13:20:49 +00:00
Julian Smart
088117622c Checked for stream validity in wxImage::GetImageCount.
use horse3.ani in image sample.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-05 10:19:00 +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
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
Robert Roebling
fdbb06ba2c wxImage::Copy() didn't really just copy the
image, it sometimes changed the mask
     colour, when it was unused. This patch
     makes life easier.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-22 21:01:54 +00:00
Vadim Zeitlin
79fa23744b check the return code of wxStream::Read() in wxImageHandler::DoCanRead()
and avoid reading uninitialized memory when it fails


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-18 12:41:51 +00:00
Gilles Depeyrot
1b0674f799 corrected warnings when compiling with -Wall -W
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-03 19:49:20 +00:00
Julian Smart
0fa784572f Separated wxImage::FloodFill from image.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-01 22:14:42 +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
36aac19594 previous change to wxImage was wrong, it didn't account for saving same image twice
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-16 11:37:50 +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