Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/image data any #2712

Merged
merged 122 commits into from Feb 19, 2015
Merged

Release/image data any #2712

merged 122 commits into from Feb 19, 2015

Commits on Jan 6, 2015

  1. 7 Configuration menu
    Copy the full SHA
    b0b89e7 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2015

  1. Configuration menu
    Copy the full SHA
    b28aadc View commit details
    Browse the repository at this point in the history
  2. remove static_visitor usage and rely on automatic result type deduction

    (NOTE: expression_evaluator requires  ```using result_type = T1;``` )
    artemp committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    c2ea32f View commit details
    Browse the repository at this point in the history
  3. use std::make_shared

    artemp committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    f6651ac View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4aa54f6 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    cd0ac2d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    00a20b7 View commit details
    Browse the repository at this point in the history
  7. An intial commit of a large set of changes attempting to clean up the…

    … way that saving images is processed in image_util.hpp and image_util.cpp.
    
     * Changed the passing of rgba_palette to a shared_ptr in order to better facilitate the use of a visitor pattern.
     * Moved PNG util processing into its own set of files so that image_util_impl.hpp would not have to depend on HAVE_PNG.
    flippmoke committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    a3f6a98 View commit details
    Browse the repository at this point in the history
  8. More stuff to break it all

    flippmoke committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    6df6881 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2015

  1. Configuration menu
    Copy the full SHA
    b534301 View commit details
    Browse the repository at this point in the history
  2. image_compositing - fix composite method signature to composite(T & d…

    …st, T const& src,...) via providing const_rendering_buffer adapter
    artemp committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    515491a View commit details
    Browse the repository at this point in the history
  3. An intial commit of a large set of changes attempting to clean up the…

    … way that saving images is processed in image_util.hpp and image_util.cpp.
    
     * Changed the passing of rgba_palette to a shared_ptr in order to better facilitate the use of a visitor pattern.
     * Moved PNG util processing into its own set of files so that image_util_impl.hpp would not have to depend on HAVE_PNG.
    flippmoke committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    454326d View commit details
    Browse the repository at this point in the history
  4. More stuff to break it all

    flippmoke committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    cc0a27f View commit details
    Browse the repository at this point in the history
  5. Some more minor changes

    flippmoke committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    847682d View commit details
    Browse the repository at this point in the history
  6. Continuing to modify various areas of image_util so that save_to_stre…

    …am will be provided an image_data_any object.
    flippmoke committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    81ef422 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    472e419 View commit details
    Browse the repository at this point in the history
  8. Split out the process for tiff, webp, and jpeg into their own util fo…

    …lders. Added the intial concepts for an image_view_any variant.
    flippmoke committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    0355574 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2015

  1. Another large set of modifications, finally allow this branch to buil…

    …d. Mostly modifications to the image_util_* files. Different processing based on the image type is now possible, and save_to_stream now could possibly accept grayscale with out breaking existing code.
    flippmoke committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    094d0ec View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into bugfix/image_util_impl

    Conflicts:
    	include/mapnik/image_view.hpp
    	src/image_util.cpp
    flippmoke committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    08c675e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b05e6b8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b2118b6 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    42ee4ec View commit details
    Browse the repository at this point in the history
  6. Undo change to localize

    flippmoke committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    d7f758e View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2015

  1. Configuration menu
    Copy the full SHA
    7a16ebe View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2379c39 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f58f65e View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2015

  1. Added is_solid to image_utils. It is currently built to support the e…

    …ventual use of image_view_any and image_data_any, but for a limited time supports the passing of image_view_rgba8 and image_data_rgba8.
    
    Ref #2633
    flippmoke committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    4b25c75 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2015

  1. Moved premultiply and demultiply out of image_32 and other parts of t…

    …he code. The image_data object is now responsible for keeping track of its own premultiplied_alpha status. Created a new utility method in image_util to preform premultiplication.
    
    Added visitor pattern to several different methods as well to prepare for image_data_any including compositing.
    
    Ref #2633
    flippmoke committed Jan 14, 2015
    Configuration menu
    Copy the full SHA
    4184f75 View commit details
    Browse the repository at this point in the history
  2. Some minor corrections to allow for the source to build properly with…

    … out linking errors with vis to hidden.
    flippmoke committed Jan 14, 2015
    Configuration menu
    Copy the full SHA
    cbc76f7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    03440c0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    42c7d7d View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2015

  1. Added a lot of premultiply_alpha functions to attempt to have proper …

    …premultiplication of data prior to compositing. There still seem to be some errors in the resulting images, but I am not quite sure what they are yet.
    flippmoke committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    202a0e8 View commit details
    Browse the repository at this point in the history
  2. fix compile of svg2png

    Dane Springmeyer committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    1f25bae View commit details
    Browse the repository at this point in the history
  3. fix handling of premultiplied pixels during rendering

    Dane Springmeyer committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    364fb49 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #2640 from mapnik/feature/premultiply_demultiply_move

    Feature/premultiply demultiply move
    Dane Springmeyer committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    7d2db67 View commit details
    Browse the repository at this point in the history
  5. fix is_solid return

    Dane Springmeyer committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    e03739e View commit details
    Browse the repository at this point in the history
  6. fix linking error with saving image

    Dane Springmeyer committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    d0d899a View commit details
    Browse the repository at this point in the history
  7. move is_solid to hpp for now to avoid linking errors

    Dane Springmeyer committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    508521d View commit details
    Browse the repository at this point in the history
  8. Added is_solid to image_utils. It is currently built to support the e…

    …ventual use of image_view_any and image_data_any, but for a limited time supports the passing of image_view_rgba8 and image_data_rgba8.
    
    Ref #2633
    flippmoke committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    7ce7416 View commit details
    Browse the repository at this point in the history
  9. fix is_solid return

    Dane Springmeyer authored and flippmoke committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    40c1649 View commit details
    Browse the repository at this point in the history
  10. fix linking error with saving image

    Dane Springmeyer authored and flippmoke committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    61bc705 View commit details
    Browse the repository at this point in the history
  11. move is_solid to hpp for now to avoid linking errors

    Dane Springmeyer authored and flippmoke committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    cf64603 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    73d9c60 View commit details
    Browse the repository at this point in the history
  13. Merge branch 'feature/is_solid_move' of github.com:mapnik/mapnik into…

    … feature/is_solid_move
    
    Conflicts:
    	include/mapnik/image_util.hpp
    flippmoke committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    0a1a0b4 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    4d31459 View commit details
    Browse the repository at this point in the history
  15. Merge pull request #2637 from mapnik/feature/is_solid_move

    is_solid to image_util
    flippmoke committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    58f5812 View commit details
    Browse the repository at this point in the history
  16. Removed the set_rectangle_alpha code from image_32. Added new blend u…

    …sing composite to python bindings to replace it by doing src_over with composite.
    
    Ref #2633
    flippmoke committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    1f540b4 View commit details
    Browse the repository at this point in the history
  17. Merge pull request #2643 from mapnik/feature/blend_cleanup

    Removed the set_rectangle_alpha code from image_32. Added new blend usin...
    flippmoke committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    c74df56 View commit details
    Browse the repository at this point in the history
  18. Moved set_alpha to src/image_util.cpp and out of image_32. Added a bo…

    …olean response to premultiply_alpha and demultiply_alpha so that if it is changed in set_alpha and other locations like the python bindings for composite that the image can be restored to its original state. Removed blend from python bindings.
    
    Ref #2633
    flippmoke committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    3b1c99f View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2015

  1. Configuration menu
    Copy the full SHA
    33ccc12 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5bc83ee View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2645 from mapnik/feature/set_alpha_move

    Moved set_alpha to src/image_util.cpp and out of image_32. Added a boole...
    flippmoke committed Jan 16, 2015
    Configuration menu
    Copy the full SHA
    ff019cb View commit details
    Browse the repository at this point in the history
  4. Removed the background and set/get background from image_32 class. Re…

    …moved clear method from image_32. Added new fill method for image_data_any, that allows many generic types to fill an image.
    
    Ref #2633
    flippmoke committed Jan 16, 2015
    Configuration menu
    Copy the full SHA
    aebb6fe View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    35be611 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a7b8ca2 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0b2c4e5 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    1470bea View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2015

  1. Added set_pixel to visitor pattern and moved it to image_util. Added …

    …exception throwing in composite only if debug flags are on.
    
    Ref #2633
    flippmoke committed Jan 17, 2015
    Configuration menu
    Copy the full SHA
    a002139 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aa03cf4 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2015

  1. 2 Configuration menu
    Copy the full SHA
    2439f1b View commit details
    Browse the repository at this point in the history
  2. minor include cleanup for image_utils

    Dane Springmeyer committed Jan 20, 2015
    Configuration menu
    Copy the full SHA
    97869f7 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2015

  1. This is a complete removal of code that utilizes image_32 in the libr…

    …ary. It is a sweeping change that does some of the following:
    
    * Changes all agg_renderers to use a image_data_any variant (only image_data_rgba8 is implemented currently)
    * Changes the marker and marker_cache to use image_data_any images
    * Changes the symbolizers so that they must be aware of the source data type they are attempting to render and the render type that is expected to be rendered into.
    * Moves many utilities into image_utils, that were previously in image_32.
    
    The kicker is that this still isn't working perfectly yet, but I am commiting so I don't have tears in case everything is lost on my computer.
    
    Ref #2633
    flippmoke committed Jan 21, 2015
    Configuration menu
    Copy the full SHA
    badb0c9 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'release/image_data_any' of github.com:mapnik/mapnik int…

    …o release/image_data_any
    flippmoke committed Jan 21, 2015
    Configuration menu
    Copy the full SHA
    9fda26f View commit details
    Browse the repository at this point in the history
  3. fix compile of rundemo.cpp

    Dane Springmeyer committed Jan 21, 2015
    Configuration menu
    Copy the full SHA
    4856886 View commit details
    Browse the repository at this point in the history
  4. temp fix: copy rather than move image_data inside marker to avoid mut…

    …ating marker
    Dane Springmeyer committed Jan 21, 2015
    Configuration menu
    Copy the full SHA
    df96133 View commit details
    Browse the repository at this point in the history
  5. Some smaller fixes that cause the proper operator to be called in vis…

    …itor_create_marker. All tests now passing. Ref #2633
    flippmoke committed Jan 21, 2015
    Configuration menu
    Copy the full SHA
    b57b1c1 View commit details
    Browse the repository at this point in the history
  6. 1 Configuration menu
    Copy the full SHA
    93f8351 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2015

  1. fix stray include of graphics.hpp

    Dane Springmeyer committed Jan 22, 2015
    Configuration menu
    Copy the full SHA
    82bc43c View commit details
    Browse the repository at this point in the history
  2. Changed the name of image_data_any to image_any. Moved header file fo…

    …r image_data_any to image_any. Ref #2633
    flippmoke committed Jan 22, 2015
    Configuration menu
    Copy the full SHA
    0f388ed View commit details
    Browse the repository at this point in the history
  3. Merge branch 'release/image_data_any' of github.com:mapnik/mapnik int…

    …o release/image_data_any
    flippmoke committed Jan 22, 2015
    Configuration menu
    Copy the full SHA
    e4a5424 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    22a384e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e01ce5b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e353225 View commit details
    Browse the repository at this point in the history
  7. Move image_data.hpp to image.hpp and renamed most everything from ima…

    …ge_data to image alone. This might lead to the need to clean up some variables that are currently named image through out the code at some time, but I think in the long term is much better as image is a better name for the base class.
    flippmoke committed Jan 22, 2015
    Configuration menu
    Copy the full SHA
    51172c8 View commit details
    Browse the repository at this point in the history
  8. fix compile of rasterlite plugin

    Dane Springmeyer committed Jan 22, 2015
    Configuration menu
    Copy the full SHA
    faddf1a View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2015

  1. Configuration menu
    Copy the full SHA
    490645d View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2015

  1. Fixed the issues associated with TIFFs, now they always will return a…

    …s premultiplied in the event they are rgba8 due to the way that the TIFF reader operates. Also added premultiply as a flag inside color class and exposed many of its components, made it so that setting and getting pixels took into consideration the state of the color and the image when dealing with the two.
    flippmoke committed Jan 24, 2015
    Configuration menu
    Copy the full SHA
    a100b2f View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2015

  1. Fixed some issues in color and bindings where you could create a colo…

    …r and premultiplied was not set and it was resulting in it being assigned randomly, causing some issues at runtime.
    
    Updated some images in visual tests that were orginally set prior to all tiffs being premultiplied, this was causing a slight difference in a few pixels.
    
    Updated the tiff tests a lot.
    
    Fixed tiff reader so that it always considers everything read from RGB or RGBA as premultiplied. This is due to the fact that RGBA reader always premultiplies the alpha no matter its original form.
    
    Put in a fix so that the file does not exist no longer shows up in the test running.
    
    Fixed some failing tests in the c++ test due to tiffs now always being premultiplied for RGB(A)
    flippmoke committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    5d9f047 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2653 from mapnik/bugfix/tiff_io

    Bugfix/tiff io
    flippmoke committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    64ed541 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f616367 View commit details
    Browse the repository at this point in the history
  4. Fix for benchmark

    flippmoke committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    997da1e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    31a0caf View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2015

  1. Merge branch 'master' of github.com:mapnik/mapnik into release/image_…

    …data_any
    
    Conflicts:
    	tests/python_tests/image_tiff_test.py
    Dane Springmeyer committed Jan 27, 2015
    Configuration menu
    Copy the full SHA
    48982c0 View commit details
    Browse the repository at this point in the history
  2. image.composite: source should be immutable

    Dane Springmeyer committed Jan 27, 2015
    Configuration menu
    Copy the full SHA
    84b5194 View commit details
    Browse the repository at this point in the history
  3. use image.blend is gone so use image.composite

    Dane Springmeyer committed Jan 27, 2015
    Configuration menu
    Copy the full SHA
    921c058 View commit details
    Browse the repository at this point in the history
  4. add visual tests for pgraster to try to make sense of failures

    Dane Springmeyer committed Jan 27, 2015
    Configuration menu
    Copy the full SHA
    ebfbbef View commit details
    Browse the repository at this point in the history
  5. actually src needs to be non-const

    Dane Springmeyer committed Jan 27, 2015
    Configuration menu
    Copy the full SHA
    fa17f0b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c8f70d3 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d94f5a0 View commit details
    Browse the repository at this point in the history
  8. Added compare utility to python bindings and image_util, modified set…

    …_grayscale_to_alpha to take a color optionally.
    flippmoke committed Jan 27, 2015
    Configuration menu
    Copy the full SHA
    b090882 View commit details
    Browse the repository at this point in the history
  9. Found more situations where getRowSize should be used over multiplyin…

    …g the width by the pixel size.
    flippmoke committed Jan 27, 2015
    Configuration menu
    Copy the full SHA
    bc28c12 View commit details
    Browse the repository at this point in the history
  10. Added required include

    flippmoke committed Jan 27, 2015
    Configuration menu
    Copy the full SHA
    dc93155 View commit details
    Browse the repository at this point in the history
  11. Merge branch 'master' of github.com:mapnik/mapnik into release/image_…

    …data_any
    
    Conflicts:
    	tests/python_tests/pgraster_test.py
    Dane Springmeyer committed Jan 27, 2015
    Configuration menu
    Copy the full SHA
    dfb6116 View commit details
    Browse the repository at this point in the history
  12. python: fix compile when cairo is enabled but not pycairo

    Dane Springmeyer committed Jan 27, 2015
    Configuration menu
    Copy the full SHA
    939e53e View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2015

  1. Added new image_cast method and added its bindings to python, added t…

    …wo new properities to images: offset and scaling. Added way to cast between image types with offset and scaling. Added new unit tests for color and casting. Made it so that pixel setting doesn't result in overflows or underflows. Made the return of get_pixel, dynamic based on what is passed to it. Added new methods for setting pixels that are doubles and ints.
    flippmoke committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    de99180 View commit details
    Browse the repository at this point in the history
  2. Renamed background to fill, added numeric casting to fill utility, ch…

    …anged clog uses to MAPNIK_LOG, changed the implementation of fill some so that it only used a single template
    flippmoke committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    826e13f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5a4f932 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2015

  1. Merge branch 'master' of github.com:mapnik/mapnik into release/image_…

    …data_any
    
    Conflicts:
    	tests/python_tests/image_test.py
    	tests/python_tests/image_tiff_test.py
    	tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-1.0-agg-reference.png
    	tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-2.0-agg-reference.png
    Dane Springmeyer committed Feb 3, 2015
    Configuration menu
    Copy the full SHA
    71e7fae View commit details
    Browse the repository at this point in the history
  2. merge with master + fixups

    Dane Springmeyer committed Feb 3, 2015
    Configuration menu
    Copy the full SHA
    0e017be View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2015

  1. A large set of updates:

    * Added new gray data types adding those to the variants and updating all the code necessary for them
    * Added basic SSE to the image compare method, (only for RGBA) must be enabled with the -DSSE_MATH flag this is not yet put into the build process in any location.
    * Fixed the resulting image for some TIFF visual tests, most likely they were incorrect due to fixes in TIFF reader
    * Added some MAPNIK_DECL where necessary to grid rendering.
    * Added support for more data types in GDAL plugin with grayscale images.
    * Added views for all the new gray data types
    * Updated python bindings for new gray data types.
    
    Ref #2681
    flippmoke committed Feb 4, 2015
    Configuration menu
    Copy the full SHA
    2b8bd59 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ffb3454 View commit details
    Browse the repository at this point in the history
  3. Fixed issues with SSE compare when the threshold is greater then zero…

    …. Added several new SSE methods for unsigned integers.
    flippmoke committed Feb 4, 2015
    Configuration menu
    Copy the full SHA
    c0fcf48 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2015

  1. Configuration menu
    Copy the full SHA
    06ef081 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5966b12 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    04d51d3 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2015

  1. Configuration menu
    Copy the full SHA
    9875335 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into release/image_data_any

    Conflicts:
    	include/mapnik/grid/grid_marker_helpers.hpp
    flippmoke committed Feb 6, 2015
    Configuration menu
    Copy the full SHA
    6e0d6d4 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2015

  1. Configuration menu
    Copy the full SHA
    d31bf5b View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2015

  1. Merge branch 'master' of github.com:mapnik/mapnik into release/image_…

    …data_any
    Dane Springmeyer committed Feb 11, 2015
    Configuration menu
    Copy the full SHA
    89a58c5 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2015

  1. Updated image_any building switch statement to support all the correc…

    …t types, added tests for all the new data formats with get and set in python.
    flippmoke committed Feb 16, 2015
    Configuration menu
    Copy the full SHA
    0cd9c1f View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into release/image_data_Any

    Conflicts:
    	benchmark/test_polygon_clipping.cpp
    flippmoke committed Feb 16, 2015
    Configuration menu
    Copy the full SHA
    b2c1c86 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6418a12 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2015

  1. start fixing windows compile - refs #2708

    Dane Springmeyer committed Feb 17, 2015
    Configuration menu
    Copy the full SHA
    842e4be View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    817489e View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2015

  1. BOOM SHAKALAKA:

    This update is in Ref #2649. It provides an update to markers and their processing such that:
    
     * All shared_ptrs are no longer required around markers
     * Markers are now const
    flippmoke committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    390fbaa View commit details
    Browse the repository at this point in the history
  2. Merge branch 'release/image_data_any' of github.com:mapnik/mapnik int…

    …o release/image_data_any
    flippmoke committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    744dc44 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5180168 View commit details
    Browse the repository at this point in the history
  4. no need for templated 'raster_marker_render_thunk'

    Dane Springmeyer committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    cb869e6 View commit details
    Browse the repository at this point in the history
  5. fix type of raster_marker_render_thunk'

    Dane Springmeyer committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    2aa23ec View commit details
    Browse the repository at this point in the history
  6. insert_marker to take rvalue it if is moved inside the function

    Dane Springmeyer committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    dd0b845 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    2ebce8e View commit details
    Browse the repository at this point in the history
  8. Merge branch 'release/image_data_any' of github.com:mapnik/mapnik int…

    …o release/image_data_any
    flippmoke committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    198be8f View commit details
    Browse the repository at this point in the history