New branch 'feature/gtkbmptiledviewer2' available with the following commits: commit 8125799c6f9a9aa5f75d30c32228bab7c4f2f7e5 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Tue Jun 10 17:15:49 2014 +0100
Add base value to set alpha channel for 32 bit colourspaces. Currently the alpha channel is completely ignored by basebmp. However this results in completely "transparent" output, meaning the client has to manually overwrite the alpha channel -- instead we now set it automatically when writing colourdata. Unfortunately this doesn't quite work -- it seems that drawing a non-opaque bitmap/image on top of the existing bitmap can erase the alpha channel information (i.e. these areas will once again be transparent -- for example document borders seem to have a transition effect overlayed onto them): presumably there is some method that bypasses our RGBMaskSetter (probably some form of direct manipulation of raw values?). manipulation in basebmp Change-Id: Ia4be6a748cc30191a4422121f9ec347d9198b225 commit bd09f8626ea3afec92934fbb28a71e7d551746f9 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Sun May 25 18:30:00 2014 +0100 Get rid of outdated comments. We can now set the colourspace as desired, and we return the rowstride too. Change-Id: Idf1e55a67b9e9ab58e82d7ed0be2813b682ec2ff commit c1cef856ec2b6ab9a4a9acff5ea95af6656066bb Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Sun May 25 16:42:17 2014 +0100 Upgrade gtktiledviewer to use its own buffer. Change-Id: I3f567ff19ee0d5b0d54aeef9b163b78567d72946 commit 5ae979ec6ba5259c238950122221bfd04b8f5ff5 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Wed Jun 11 16:24:33 2014 +0100 Use external buffer for LibLO tiled rendering. Means we can get rid of hackily storing a reference to the last buffer we created. Change-Id: I8092a7d87bc391301f75651a59b37fbd73ac64fd commit 4527a8bb4ca6374edf434e38c62bc0969a9cd24c Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Sun May 25 16:40:47 2014 +0100 Allow passing in external buffers to svp's VirtualDevice. We also want to be able to set whether or not the buffers should be painted to top down, so add that parameter as necessary (default seems to be false, however e.g. gtk requires this to be true, i.e. needed for tiled rendering). Change-Id: Id98882e4c7f62508ae5a976c0d8df743460a4ab2 commit 6f454e7a1db07d5067292c6f8cb81284138ed3d4 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri May 23 20:02:05 2014 +0100 Upgrade gtktiledviewer to RGBA. The Alpha channel seems to be set incorrectly by LO, hence we need to manually set it here for now. Change-Id: I1f9091b8b6f88c1dba6653dfb7bf51f9fe14b3fc commit e0fb85ebf2913100177acaf8ba06b31205813194 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri May 23 20:00:58 2014 +0100 Upgrade LibLO tiled rendering to RGBA. This is the expected format for gtk+ pixbufs which is currently the primary target. We could potentially allow the user to choose the format via LibLO -- but we want to eventually allow passing in a buffer (rather than passing out an LO owned buffer) anyway, so should add that then. Change-Id: I8427925a94366917fa82fb8ea28e7dbb3fa1840d commit cda942a713a6a92cd71f272a84c78b98d086d400 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri May 23 19:59:03 2014 +0100 svp: deduplicate bitcount->colourspace mapping and allow overriding. Although svp defaults to BGR, we might want to use alternative formats (e.g. for tiled rendering to bitmap buffers which are to be used in e.g. gtk), it is probably safest to keep the current defaults but allow the user to change to whatever format they may require. (This currently only makes sense for the 32-bit RGBA/ARGB/etc. formats. However the 23 bit formats could potentially be expanded to allow a similar RGB/BGR choice.) Change-Id: I70bd3d6e7d297faef163b910f576655efee4cb3f commit b7f4f7de073a1299e5a22c3998b31b23011029f3 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Sun May 18 08:37:13 2014 +0100 Draw the whole image for our gtk tiled viewer. We just draw one huge tile, it doesn't seem to work too well for larger documents though where the latter portions can appear empty. Change-Id: Ic527aec377bf2f82a528a04392186d3d8b752762 commit 4d322f7ecbe98dea50d51b85794054602abee17f Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Sun May 18 08:36:16 2014 +0100 Implement document size retrieval for LibLO. Change-Id: Ibd69f8e766fd421b05d2305f967179a969bc5b56 commit 7c7437662ca2ed63add70ee0a35f6c0f4d18b84d Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Sun May 18 08:30:15 2014 +0100 Add rowstride to tiled rendering via LibLO. The buffer width could be larger than the desired rendering width, hence we need to give the client access to the rowstride. Change-Id: Ic63c1f455c89960164e076ed2528d43e64e81a40 commit 09e0734d10d91e84012ee9e2766dbd205ffd031a Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri May 16 09:22:09 2014 +0100 Add the full sofficerc for LibLO. This gets rid of various ucb.ucp.gio warnings when doing tiled rendering, but doesn't seem to affect the display of the basic document so perhaps not necessary. Change-Id: I86e13192ddb5904afabca38d3a201f17f145de09 commit 40145f955e6690e7000ad29ae539ac8d5879c4eb Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri May 16 09:08:41 2014 +0100 Use bitmap buffers in the gtktiledviewer. Looks pretty decent now -- however the vertical flipping isn't ideal. Change-Id: I6ffa9d2b8fced142308781e06e8f161228f1db26 commit 31559e7f2ca885285436b45665959146ba6ad224 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri May 16 09:07:52 2014 +0100 Return a bitmap buffer for tiled rendering from LibLO. We still need some way of managing the buffers properly rather than just keeping a static reference to the last buffer that was rendered. Change-Id: I17940c758948aa9418f4e0216ecd253d128cd04f commit 24588ae5ead9afca1af99d287db5a6630e80d907 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri May 9 14:39:55 2014 +0100 Add some rendering to our gtktiledviewer. Just a hardcoded single tile for now. Change-Id: I9bfae4243e0083aa8fca38ae98dc369fe6de36fb commit 886b05cad70a5045094c3a2fc427470513bf3fcc Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri May 9 14:37:27 2014 +0100 Add tiled rendering via liblibreoffice. We still need to add functions for getting dimensions of documents etc. for this to be truly useful, this is also only usable for writer documents for now. Change-Id: I07812c9b72caca71dfd509705af48c1d355cb2f8 commit 4ce04879a58ec757ffc2b31b99a5ee0705eed20b Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Wed May 7 20:14:59 2014 +0100 TiledRendering: outline of basic gtk tiled rendering app using liblibreoffice. Change-Id: I46760c0a1329b9823fd999c470b57fef66d28914 commit df56711cbf67888ff65970cbf4ea71442644009a Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Wed Jun 11 15:37:17 2014 +0100 Complete LibreOfficeKit C++ renaming. Change-Id: Ice611cf5913051346a3a0c0b00ed35a35a0dfe3c _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits