Robert Roebling
dcc36b34be
[ 1579793 ] numerous bug fixes when mask is used
...
Corrects PNG handling and wxImage::Paste()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-18 17:06:11 +00:00
Stefan Neis
dd61e8ed01
Use "cdecl" linkage mode for all ports with OpenWatcom (particularly WXPM).
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 21:42:39 +00:00
Robert Roebling
982a6623f7
[ 1558691 ] wxPNGHandler: Preserve palette
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-17 11:43:17 +00:00
Włodzimierz Skiba
02761f6cd4
Include wx/module.h according to precompiled headers of wx/wx.h (with other minor cleaning).
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-31 19:31:43 +00:00
Włodzimierz Skiba
0bca037363
Include wx/bitmap.h according to precompiled headers of wx/wx.h (with other minor cleaning).
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-14 10:02:19 +00:00
Włodzimierz Skiba
e7c80f9e05
wx/debug.h is always unconditionally included by wx/defs.h
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-24 15:13:23 +00:00
Włodzimierz Skiba
8898456df4
wx/wxprec.h already includes wx/defs.h (with other minor cleaning).
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 07:24:35 +00:00
David Surovell
7884ab9018
fix wxMac compilation problem by hoisting simple variable declarations above all goto stmts
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 16:21:55 +00:00
Vadim Zeitlin
0e0589e873
fixed handling PNG errors accidentally broken in rev 1.46 (libpng would just abort on invalid files now); fixed huge memory leak when failing to load an invalid PNG
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 14:12:48 +00:00
David Surovell
ce61519034
applied patch 1411688
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-22 21:59:00 +00:00
Włodzimierz Skiba
fc038829d5
wxMGL/Watcom linkage fix.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-10 16:52:02 +00:00
Włodzimierz Skiba
6d3d756a6a
Macros for simplified testing Open Watcom version and required tweaks.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-10 16:16:05 +00:00
Mart Raudsepp
8907154c1a
Nuke #pragma implementation/interface's
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Włodzimierz Skiba
c40158e40b
Corrections for future OW 1.4. Warning fixes.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-26 09:05:27 +00:00
Włodzimierz Skiba
7a893a3152
wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 16:22:28 +00:00
Włodzimierz Skiba
4c2740ec0f
Small warning fixes.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-04 19:23:28 +00:00
Vadim Zeitlin
dc683654a1
fix to previous patch: don't crash when saving in 16bpp
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-27 15:36:21 +00:00
Vadim Zeitlin
a4efa72179
added support for saving grey and grey-red PNG images (patch 985447)
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-27 15:24:50 +00:00
Dimitri Schoolwerth
e1e36a3e21
don't create a png alpha image if we don't have to
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-22 00:13:51 +00:00
Robert Roebling
f773e9b0bb
Backed-out PNG8 patch (no time to look at why
...
it breaks other PNGs).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-11 21:52:36 +00:00
Robert Roebling
e854ed477e
Applied patch for PNG8 alpha mask.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 22:29:25 +00:00
Włodzimierz Skiba
ce403057df
Warning fixes.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 11:43:53 +00:00
Vadim Zeitlin
fd35980623
we don't have to call png_set_error_fn() any more after last commit
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 23:07:11 +00:00
Vadim Zeitlin
d10c19d6e0
use wx_png_error/warning when calling png_create_read/write_struct(), don't return from wx_png_error
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 22:58:29 +00:00
Julian Smart
154e1ca181
Resolved ambiguity
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 10:52:01 +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
Vadim Zeitlin
c1296b82d4
don't waste time initializing the memory of newly created wxImage before filling it with PNG data
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-20 23:41:54 +00:00
Robin Dunn
5f5183d34b
Save the alpha values if the image has an alpha channel
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-15 01:05: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
Václav Slavík
e9b964cfe5
prefix symbols with wx_ to reduce risk of collision
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-30 12:20:40 +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
Robin Dunn
e45cc23511
Two fixes for CheckTransparency. First, don't start checking from
...
(x+1,y) since you don't know if (x,y) is transparent or not. Second,
use x*(numColBytes+1) instead of just x to offset into the first
line.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 18:47:38 +00:00
Vadim Zeitlin
36308e0e02
fixed completely broken CheckForTransparency()
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 12:48:11 +00:00
Vadim Zeitlin
c9fcf5817f
many fixes for PNG reading after recent alpha changes; grey scale images reading was in particular broken
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 10:49:27 +00:00
Vadim Zeitlin
f7155274cc
fixed a harmless warning
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 01:26:43 +00:00
Vadim Zeitlin
d26d975463
fixed CheckTransparency() for RGBA images
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 00:03:16 +00:00
Vadim Zeitlin
27bb2b7cea
added support for reading alpha channel
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-03 20:39:50 +00:00
Vadim Zeitlin
e30285abc6
compilation fixes for non default wxUSE_XXX values (patch 662781)
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 22:20:46 +00:00
Vadim Zeitlin
30e0e2518f
tried to fix compilation with Watcom 11 (should fix the bug 651492)
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 23:18:44 +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
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
Václav Slavík
bdffd806c3
modified wxPNGHandler to not use png_struct.jmpbuf
...
(its size is compiler-dependant, so it wasn't possible to use libpng as a DLL,
and that's a problem since MGL exports it's own libpng)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-26 00:19:53 +00:00
Vadim Zeitlin
903506828b
fixes for the compilation warnings with Sun CC:
...
1. some fixes for "String literal to char * conversion" warnings (many
more left in the *.xpm files)
2. fixes for "assignment of function to extern "C" function"
3. a few other miscellaneous ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-09 12:49:12 +00:00
Václav Slavík
0729bd19f1
reverted SciTech sabotage of Watcom compilation (invalid definition of PNG,TIFF LINKAGEMODE)
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-08 23:25:56 +00:00
Václav Slavík
4d97d44e14
(temporary) hotfix for Watcom/DOS and PNGLINKAGEMODE
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-07 22:39:59 +00:00
Kendall Bennett
33ac7e6f01
Updates to fix Watcom C/C++ 11.0 compiler warning problems. Now compiles
...
clean with this compiler. Hopefully I did this without breaking other
compilers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-02 19:48:15 +00:00
Václav Slavík
c96ea65713
added wxUSE_IMAGE; added write-only wxXPMHandler
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 22:31:53 +00:00