Commit Graph

124 Commits

Author SHA1 Message Date
Vincent Sanders
8e1b4a0061 fix box_dump call
fix spurious newlines in log message

svn path=/trunk/netsurf/; revision=9919
2010-01-28 00:03:44 +00:00
John Mark Bell
3c3536fd68 Add missing include
svn path=/trunk/netsurf/; revision=9857
2010-01-21 23:46:28 +00:00
John Mark Bell
355799ce0b Merge branches/MarkieB/gtkmain to trunk.
svn path=/trunk/netsurf/; revision=9729
2009-12-17 23:55:02 +00:00
Chris Young
8e58c63c99 Revert r9108, as component order in libnsgif due to be corrected.
svn path=/trunk/netsurf/; revision=9137
2009-08-09 21:37:20 +00:00
Chris Young
d197e03bf2 Support new libnsgif by adding bitmap flag BITMAP_ABGR.
This tells big endian systems that the data is in ABGR instead of RGBA.
It should be ignored on little endian systems!
Add support in Amiga platform code.

-> All platform code that could be compiled for big endian systems will need
   to be updated to recognise BITMAP_ABGR.  This includes GTK and
   Framebuffer frontends.  Both BITMAP_ABGR *and* the endianness of the host
   will most likely need to be checked and the allocated bitmap format
   and/or bitmap plotter changed to handle ABGR component order.

svn path=/trunk/netsurf/; revision=9108
2009-08-07 21:16:49 +00:00
John Mark Bell
3128ec1cdc Actually handle failure to allocate bitmap structure or retrieve its data buffer pointer. I hope these longjmps are valid -- libpng's documentation is unhelpfully vague on this subject.
svn path=/trunk/netsurf/; revision=8924
2009-07-31 14:01:49 +00:00
John Mark Bell
3dd350a5ea Correct include.
svn path=/trunk/netsurf/; revision=8757
2009-07-23 23:50:35 +00:00
John Mark Bell
ddeadd1c02 Merge LibCSS port to trunk.
svn path=/trunk/netsurf/; revision=8752
2009-07-23 23:05:34 +00:00
John Mark Bell
2565a37a52 Refactor text plotter and other font functions to remove dependency on CSS.
svn path=/trunk/netsurf/; revision=8641
2009-07-21 10:59:53 +00:00
Michael Drake
8365d46eb7 Rename TRANSPARENT to NS_TRANSPARENT to avoid clash on Windows. By MarkieB.
svn path=/trunk/netsurf/; revision=8513
2009-07-14 10:57:07 +00:00
John Mark Bell
7e01924ecf Bring in line with new bitmap plotter API
svn path=/trunk/netsurf/; revision=8216
2009-07-01 00:20:24 +00:00
Vincent Sanders
aa26843411 Improve bitmap plotter API
svn path=/trunk/netsurf/; revision=8195
2009-06-30 13:02:23 +00:00
John Mark Bell
2ba7092933 Correctly propagate plot success
svn path=/trunk/netsurf/; revision=7611
2009-05-28 16:21:32 +00:00
John Mark Bell
a96fe992ab Avoid unused variable if targetting RISC OS and the jpeg library has been built to output BGR.
svn path=/trunk/netsurf/; revision=6978
2009-03-29 00:17:01 +00:00
John Mark Bell
8468bbbb2d Aliasing fixes
svn path=/trunk/netsurf/; revision=6961
2009-03-28 01:27:44 +00:00
John Mark Bell
8f25d44891 Squash warning.
svn path=/trunk/netsurf/; revision=6935
2009-03-27 02:47:16 +00:00
John Mark Bell
d4bdb0882a Don't include libmng.h from mng.h, as it causes jconfig.h to be seen, which in turn causes HAVE_STDLIB_H to be defined, which clashes with the definition of hpdf_config.h. Quite why the auto-generated configuration header for either jpeglib or libharu needs to be public, I've no idea.
The above change means that the mng_handle field in content_mng_data is a void *.
Fixup the couple of places in mng.c where the mng_handle field needs casting back to its real type. Also take the opportunity to make linewrapping and brace position more consistent.

svn path=/trunk/netsurf/; revision=6918
2009-03-27 01:58:55 +00:00
John Mark Bell
07e1187b69 Add .spr -> image/x-riscos-sprite MIME mapping to GTK front end
Fix crash inducing bugs in nssprite.c

svn path=/trunk/netsurf/; revision=6743
2009-03-09 00:58:23 +00:00
Michael Drake
8dfdd67e87 Make libpng image handler set opaque info.
svn path=/trunk/netsurf/; revision=6669
2009-03-02 18:24:54 +00:00
Chris Young
95039df607 If a GIF has insufficient frame data, display the frames that have been decoded.
svn path=/trunk/netsurf/; revision=5947
2008-12-30 13:23:36 +00:00
François Revel
53fe38504f C89
svn path=/trunk/netsurf/; revision=5837
2008-11-29 22:53:58 +00:00
François Revel
e4fba7f577 Add missing calls to bitmap_modified(). This fixes using libpng in the BeOS port.
svn path=/trunk/netsurf/; revision=5532
2008-10-10 20:54:49 +00:00
Daniel Silverstone
6a9f156fc6 Fix format string warning error
svn path=/trunk/netsurf/; revision=5528
2008-10-10 09:50:42 +00:00
Rob Kendrick
9343a94193 Warning squashes
svn path=/trunk/netsurf/; revision=5527
2008-10-10 09:47:52 +00:00
Daniel Silverstone
0a580aa82d Ensure image/png.h gets css/css.h for the colour typedef
svn path=/trunk/netsurf/; revision=5464
2008-10-01 13:45:40 +00:00
John Tytgat
eca332c8d5 Include css/css.h for type colour (following change r5459).
svn path=/trunk/netsurf/; revision=5461
2008-09-28 22:57:31 +00:00
John Tytgat
2d1481fafc 'unsigned long' -> 'colour' where it made sense.
svn path=/trunk/netsurf/; revision=5459
2008-09-28 22:37:13 +00:00
John Tytgat
598b5fbbc1 One warning less.
svn path=/trunk/netsurf/; revision=5451
2008-09-28 13:31:55 +00:00
Michael Drake
03fdf02272 Fix warnings.
svn path=/trunk/netsurf/; revision=5349
2008-09-16 13:45:59 +00:00
John Mark Bell
a001437a66 Potentially squash warnings
svn path=/trunk/netsurf/; revision=5341
2008-09-15 23:20:07 +00:00
John Mark Bell
385d274f5b A bunch of fixes to the libpng binding
svn path=/trunk/netsurf/; revision=5338
2008-09-15 22:45:44 +00:00
François Revel
8c2a7e23de Fix include path for libpng.
Libpng mandates using <png.h>, if it doesn't work for you, fix your OS :D
(or use -I)
See http://www.libpng.org/pub/png/libpng-1.2.5-manual.html#section-2

svn path=/trunk/netsurf/; revision=5333
2008-09-15 21:12:48 +00:00
Daniel Silverstone
d3270ed648 Add libpng support. Default to off.
svn path=/trunk/netsurf/; revision=5330
2008-09-15 20:23:02 +00:00
Michael Drake
04c04d98b8 More style guide formatting and tidy up.
svn path=/trunk/netsurf/; revision=5195
2008-08-24 15:44:29 +00:00
Michael Drake
b346730f4f Fix get_frame to correctly catch up with current frame. Thanks to dynis.
svn path=/trunk/netsurf/; revision=5193
2008-08-24 12:52:38 +00:00
Michael Drake
b89e953bc8 Style Guide; formatting changes.
svn path=/trunk/netsurf/; revision=5192
2008-08-24 12:40:35 +00:00
John Mark Bell
9e68e32338 Warnings.squash();
svn path=/trunk/netsurf/; revision=5088
2008-08-13 14:11:05 +00:00
James Bursa
33107b160f Merged revisions 4345-4346,4350-4351,4389,4391,4395,4401-4403,4423,4485-4486 via svnmerge from
svn://semichrome.net/branches/dynis/netsurf

........
  r4345 | dynis | 2008-06-15 18:37:23 -0500 (Sun, 15 Jun 2008) | 1 line
  
  Move NetSurf's gifread.h to libnsgif
........
  r4346 | dynis | 2008-06-15 18:38:38 -0500 (Sun, 15 Jun 2008) | 1 line
  
  Remove NetSurf's gifread.c (replaced by libnsgif)
........
  r4350 | dynis | 2008-06-15 18:57:17 -0500 (Sun, 15 Jun 2008) | 1 line
  
  Added references to libnsgif where necessary; corrected function calls where callbacks were implemented
........
  r4351 | dynis | 2008-06-15 19:00:33 -0500 (Sun, 15 Jun 2008) | 1 line
  
  Updated Makefile to compile with libnsgif
........
  r4389 | dynis | 2008-06-18 13:58:51 -0500 (Wed, 18 Jun 2008) | 1 line
  
  Altered bitmap callback table name for gif images to avoid ambiguity when bmp image library is created
........
  r4391 | dynis | 2008-06-18 14:08:39 -0500 (Wed, 18 Jun 2008) | 1 line
  
  Updated netsurf branch to use new bitmap callback table structure name that was altered in libnsgif
........
  r4395 | dynis | 2008-06-18 14:54:51 -0500 (Wed, 18 Jun 2008) | 1 line
  
  Corrected param comments for bitmap_set_suspendable()
........
  r4401 | dynis | 2008-06-18 18:39:50 -0500 (Wed, 18 Jun 2008) | 1 line
  
  Added references to libnsbmp where necessary; corrected function calls where callbacks were implemented
........
  r4402 | dynis | 2008-06-18 18:40:47 -0500 (Wed, 18 Jun 2008) | 1 line
  
  Updated Makefile to compile with libnsbmp
........
  r4403 | dynis | 2008-06-18 18:41:53 -0500 (Wed, 18 Jun 2008) | 1 line
  
  Remove NetSurf's bmpread.c and bmpread.h (replaced by libnsbmp)
........
  r4423 | dynis | 2008-06-22 14:21:30 -0500 (Sun, 22 Jun 2008) | 1 line
  
  Correct a silly mistake in nsbmp_bitmap_create
........
  r4485 | dynis | 2008-07-01 04:13:48 -0500 (Tue, 01 Jul 2008) | 1 line
  
  Integrated the latest versions of libnsgif and libnsbmp into NetSurf
........
  r4486 | dynis | 2008-07-01 05:27:10 -0500 (Tue, 01 Jul 2008) | 1 line
  
  Altered bitmap functions to receive void pointers for proper utilisation of libnsgif and libnsbmp
........

svn path=/trunk/netsurf/; revision=5071
2008-08-12 03:49:34 +00:00
John Mark Bell
25018c455b Make nsgtk compile on Mac OS X.
svn path=/trunk/netsurf/; revision=5031
2008-08-11 16:44:12 +00:00
François Revel
d49fc65923 C89 again
svn path=/trunk/netsurf/; revision=4793
2008-07-29 09:25:54 +00:00
John Mark Bell
430ac1db21 Convert svgtiny colours to BGR ordering when passing them to plotter APIs.
svn path=/trunk/netsurf/; revision=4784
2008-07-28 23:26:54 +00:00
John Tytgat
203b3289b8 - Include utils/config.h before each WITH_* test entiry enabling/disabling the object file.
- Add same test in corresponding header file (if there is one)
- riscos/uri.c: include riscos/uri.h and have function definitions matching the declarations.
- Disable PDF debug logging.

svn path=/trunk/netsurf/; revision=4769
2008-07-26 23:42:24 +00:00
John Tytgat
35d3d6d0bb First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from 
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf

........
  r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
  
  Pdf plotting skeleton pinned on Print Preview in GTK.
  Just creates a file and draws lines. 
........
  r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
  
  Pdf plotter - added drawing some graphic primitives.
  Still with limited functionality, but a snapshot of the
  currently viewed page can be made and resembles the original.
........
  r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
  
  Corrected encoding name
........
  r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
  
  Colours and polygons added.
........
  r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
  
  Added rectangles, filled boxes and clipping.
  Taken into consideration joty's comments.
  Added a todo list for this part.
  Added some debug stuff and checking boundaries.
........
  r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
  
  Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
  r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
  
  Some more options in graphic primitives and normalizing some parameters.
........
  r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
  
  Plotting changed as jmb suggested (is the least invasive one from the possible)
  Added dummy bitmap plotting - way of plotting an image is determined by its type. 
........
  r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
  
  Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
  r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
  
  Added hadling images other than png and jpeg - with transparency.
........
  r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
  
  Added handling NULL-returns from all mallocs.
  Added plot_bitmap_tile handling.
  Changed code style a little.
........
  r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
  
  Added a first prototype of the paged-output organization.
  Still not sure about naming, file locations etc.
  Works with the same pdf plotting as before.
........
  r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
  
  Added primitive width adjustment and outputing the whole
  website in multiple pages.
........
  r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
  
  Fix RISC OS build failure (change r4235 wasn't complete).
........
  r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
  
  This enables "Export PDF" in RISC OS build:
  
  - Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
  - Makefile.sources(S_PDF): Add to RISC OS target as well.
  - utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
    PDF export functionality or not.
  - riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
    by Adam Blokus to write a PDF file under RISC OS.
  - riscos/save.c: Call save_as_pdf added.
  - riscos/menus.c: Add 'Export->PDF' menu entry.
  - riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
  - desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
  - desktop/print.c(print_run): Added return value.
  - Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
    (LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
  r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
  
  Added margins and page size adjustment.
........
  r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
  
  Added 'fuzzy' margins on page bottom. 
  Disabled direct png embedding, because it is too unstable in Haru now.
........
  r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
  
  Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
  r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
  
  Added skeleton of applying loose layout.
  Minor code cleaning-up.
........
  r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
  
  Implemented the elementar ideas of the loose layout.
  Added scaling in the printing routine.
  Added some basic demonstrations.
........
  r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
  
  Cleaned up the loosing code - commited to much of leftover rubbish code.
........
  r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
  
  Added duplicating box tree and current content - window flickering during printing solved.
  Minor error checking after new HPDF_Image_AddSMask call.
........
  r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
  
  Changes in loosen layout (image resizing).
........
  r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
  
  Added pdf font handling and rendering functions with the use of Haru functions.
........
  r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
  
  Added a very basic and still buggy GTK print implementation.
........
  r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
  
  Added gtk printing one more time - I have forgotten to add the main file.
........
  r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
  
  removed error with comment
........
  r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
  
  Major style improvements - added a lot of doxygen comments, 
  followed tlsa's style guide.
  Added some more error checking, too.
........
  r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
  
  Cleaned up the code.
........
  r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
  
  Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
  r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
  
  Solved the netsurf.glade clash from r4421.
........
  r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
  
  Fixed bug with wrong number of pages in gtk printing.
........
  r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
  
  - fixed uncommented line from the previous commit
  - fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
  r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
  
  Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
  r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
  
  Bug fix in nsfont_paint.
........
  r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
  
  Added gtk_selection files.
........
  r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
  
  Addam missing glade files.
........
  r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
  
  Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
  r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
  
  Declare haru_nsfont iso define an instance for each C source including the font_haru.h header.  This fixes breakage of PDF export on RISC OS.
........
  r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
  
  Applied changes according to joty's review.
  Added checking the dimensions of a plotted image to pdf plotter.
  Commented out jpg embedding (it seems to cause some problems
  I'll bring it back when I figure out what's wrong) .
  Added back some files removed by mistake.
........


svn path=/trunk/netsurf/; revision=4741
2008-07-26 16:01:59 +00:00
Rob Kendrick
40b4735f91 Change u_int32_t to uint32_t
svn path=/trunk/netsurf/; revision=4376
2008-06-17 14:39:27 +00:00
François Revel
f1b1a9737f Get rid of non ASCII \xa0 character in comments (copy-pasting a webpage ?) I also need config.h for a missing type on BeOS.
svn path=/trunk/netsurf/; revision=4265
2008-06-05 23:04:54 +00:00
James Bursa
70c7b81c2f Improve MNG error handling to show error code. Fix code not expecting bitmap_get_buffer() to return 0.
svn path=/trunk/netsurf/; revision=4237
2008-06-01 00:15:53 +00:00
John Mark Bell
f7bc0cf850 Squash warning
svn path=/trunk/netsurf/; revision=4209
2008-05-26 10:41:46 +00:00
Michael Drake
181573d081 Fix bitmap format comment.
svn path=/trunk/netsurf/; revision=4168
2008-05-16 23:04:41 +00:00
John Mark Bell
1f2219aead Make this obey WITH_MNG correctly -- previously included libmng.h regardless
svn path=/trunk/netsurf/; revision=4155
2008-05-13 21:38:30 +00:00
Rob Kendrick
79acb8b08c Further fixes for unsigned int being used as an intptr
svn path=/trunk/netsurf/; revision=4082
2008-04-07 10:37:21 +00:00