- Gfxprim - ucw.cz

[repo.or.cz] gfxprim.git branch master updated: e5413bf88214d6a7a13b0ad251befe8098a5e387
by metan 12 Jan '13

12 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via e5413bf88214d6a7a13b0ad251befe8098a5e387 (commit) from e40b6e745f6ca131059addb2b05297eccf9a474a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/e5413bf88214d6a7a13b0ad251befe8098a5… commit e5413bf88214d6a7a13b0ad251befe8098a5e387 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Jan 11 15:11:02 2013 +0100 doc: Edhance coordinate system description. diff --git a/doc/coordinate_system.txt b/doc/coordinate_system.txt index fb3f408..7ef9081 100644 --- a/doc/coordinate_system.txt +++ b/doc/coordinate_system.txt @@ -1,11 +1,30 @@ Coordinate System ----------------- -GFXprim uses Cartesian coordinate system. The pixel +(0, 0)+ lies at the upper +Coordinates +~~~~~~~~~~~ + +GFXprim uses Cartesian coordinate system. The pixel '(0, 0)' lies at the upper left corner of the bitmap and coordinates grows to the right and to the -bottom. The last valid pixel, that still lies in the bitmap of size +w+ and -+h+, occupies coordinates +(w - 1, h - 1)+. The precise position of the point -with integer coordinates is in the middle of the pixel (and borders between -the pixels lies are integers + 0.5). +bottom. The last valid pixel, that still lies in the bitmap of size 'w' and +'h', occupies coordinate '(w-1,h-1)'. The precise position of the point with +integer coordinates is in the middle of the pixel (and borders between the +pixels lies are integers + 0.5). + +[[Coordinates]] +.GFXprim coordinate system and GP_LineXYXY(5, 3, 9, 3) +image::coordinates-1.svg["Coordinate system"] + +Width and Height +~~~~~~~~~~~~~~~~ + +The width and height, when passed as an argument, are interpreted as number of +pixels to draw (rather than lengt from one pixel center to another pixel +center). Which means that for rectangle of size '(w,h)' starting at '(x,y)' +first pixel to draw would be '(x,y)' and last one would be '(x+w-1,y+h-1)'. +Especially when 'w' or 'h' is less than or equal to zero no action is taken. + +[[Coordinates_Rectangle]] +.GP_RectangleXYWH(2, 1, 8, 4) +image::coordinates-2.svg["Coordinates Rectangle"] -image:coordinates-1.svg[Coordinate System] diff --git a/doc/coordinates-1.svg b/doc/coordinates-1.svg index 841444d..427b812 100644 --- a/doc/coordinates-1.svg +++ b/doc/coordinates-1.svg @@ -9,8 +9,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" - width="546.91302" - height="426.914" + width="666.91302" + height="366.91162" id="svg2" xml:space="preserve"><metadata id="metadata8"><rdf:RDF><cc:Work @@ -18,159 +18,213 @@ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs id="defs6"><clipPath id="clipPath18"><path - d="m 0,0 437.5304,0 0,341.5312 L 0,341.5312 0,0 z" + d="m 0,0 533.5304,0 0,293.5293 L 0,293.5293 0,0 z" inkscape:connector-curvature="0" id="path20" /></clipPath></defs><g - transform="matrix(1.25,0,0,-1.25,0,426.914)" + transform="matrix(1.25,0,0,-1.25,0,366.91162)" id="g10"><g id="g12"><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g - transform="translate(0,341.5312)" + transform="translate(0,293.5293)" id="g22"><g - transform="translate(3.5304,-339.5312)" - id="g24"><path - d="M 0,0 432,0" - inkscape:connector-curvature="0" - id="path26" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 0,48 432,0" - inkscape:connector-curvature="0" - id="path28" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 0,96 432,0" - inkscape:connector-curvature="0" - id="path30" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 0,144 432,0" - inkscape:connector-curvature="0" - id="path32" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 0,192 432,0" - inkscape:connector-curvature="0" - id="path34" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 0,240 432,0" - inkscape:connector-curvature="0" - id="path36" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 0,288 432,0" - inkscape:connector-curvature="0" - id="path38" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 0,336 432,0" - inkscape:connector-curvature="0" - id="path40" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="M 0,0 0,336" - inkscape:connector-curvature="0" - id="path42" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 48,0 0,336" - inkscape:connector-curvature="0" - id="path44" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 96,0 0,336" - inkscape:connector-curvature="0" - id="path46" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 144,0 0,336" - inkscape:connector-curvature="0" - id="path48" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 192,0 0,336" - inkscape:connector-curvature="0" - id="path50" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 240,0 0,336" - inkscape:connector-curvature="0" - id="path52" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 288,0 0,336" - inkscape:connector-curvature="0" - id="path54" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 336,0 0,336" - inkscape:connector-curvature="0" - id="path56" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 384,0 0,336" - inkscape:connector-curvature="0" - id="path58" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 432,0 0,336" - inkscape:connector-curvature="0" - id="path60" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="M 0,336 0,0" - inkscape:connector-curvature="0" - id="path62" - style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="M -1.5304,3.6946 0,0 l 1.5304,3.6946 -3.0608,0 z" - inkscape:connector-curvature="0" - id="path64" - style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="M 0,0 432,0" - inkscape:connector-curvature="0" - id="path66" - style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 432,0 0,336" - inkscape:connector-curvature="0" - id="path68" - style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="m 0,336 432,0" - inkscape:connector-curvature="0" - id="path70" - style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path - d="M 428.30338,334.46877 432,336 l -3.69662,1.53123 0,-3.06246 z" - inkscape:connector-curvature="0" - id="path72" - style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><g - transform="translate(0,341.5312)" - id="g74"><text - transform="matrix(1,0,0,-1,12.1001,-24.0405)" - id="text76"><tspan + transform="translate(3.5304,-291.5293)" + id="g24"><g + transform="translate(0,293.5293)" + id="g26"><text + transform="matrix(1,0,0,-1,12.1001,-24.0386)" + id="text28"><tspan x="0 3.8744552 8.8557549 14.940911 19.922211" y="0" - id="tspan78" + id="tspan30" style="font-size:9.96259975px;font-variant:normal;font-weight:normal;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:CMR10;-inkscape-font-specification:CMR10">(0,0)</tspan></text> <g - transform="translate(0,-341.5312)" - id="g80"><path - d="m 24,312 0,0" + transform="translate(0,-293.5293)" + id="g32"><path + d="m 24,264 0,0" inkscape:connector-curvature="0" - id="path82" + id="path34" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><g - transform="translate(0,341.5312)" - id="g84"><text - transform="matrix(1,0,0,-1,386.4142,-312.0405)" - id="text86"><tspan + transform="translate(0,293.5293)" + id="g36"><text + transform="matrix(1,0,0,-1,482.4142,-264.0386)" + id="text38"><tspan x="0 3.8744552 11.069445 14.389979 19.371279 25.456436 30.991655 34.312191 39.293491" y="0" - id="tspan88" + id="tspan40" style="font-size:9.96259975px;font-variant:normal;font-weight:normal;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:CMR10;-inkscape-font-specification:CMR10">(w-1,h-1)</tspan></text> <g - transform="translate(0,-341.5312)" - id="g90"><path - d="m 408,24 0,0" + transform="translate(0,-293.5293)" + id="g42"><path + d="m 504,24 0,0" inkscape:connector-curvature="0" - id="path92" + id="path44" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><g - transform="translate(0,341.5312)" - id="g94"><text - transform="matrix(1,0,0,-1,98.1,-120.9405)" - id="text96"><tspan + transform="translate(0,293.5293)" + id="g46"><text + transform="matrix(1,0,0,-1,98.1,-120.9386)" + id="text48"><tspan x="0 3.8744552 8.8557549 11.623365 16.604666 22.689821 27.671122" y="0" - id="tspan98" + id="tspan50" style="font-size:9.96259975px;font-variant:normal;font-weight:normal;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:CMR10;-inkscape-font-specification:CMR10">(1.5,2)</tspan></text> <g - transform="translate(0,-341.5312)" - id="g100"><path - d="m 96,216 0,0" + transform="translate(0,-293.5293)" + id="g52"><path + d="m 96,168 0,0" inkscape:connector-curvature="0" - id="path102" - style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><g - transform="translate(0,341.5312)" - id="g104" /></g></g></g></g></g></g></g></g></g></g></g></g></svg> No newline at end of file + id="path54" + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 240,96 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path56" + style="fill:#9999ff;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 288,96 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path58" + style="fill:#9999ff;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 336,96 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path60" + style="fill:#9999ff;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 384,96 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path62" + style="fill:#9999ff;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 432,96 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path64" + style="fill:#9999ff;fill-opacity:1;fill-rule:nonzero;stroke:none" /><g + transform="translate(0,293.5293)" + id="g66"><text + transform="matrix(1,0,0,-1,252.1001,-168.0386)" + id="text68"><tspan + x="0 3.8744552 8.8557549 14.940911 19.922211" + y="0" + id="tspan70" + style="font-size:9.96259975px;font-variant:normal;font-weight:normal;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:CMR10;-inkscape-font-specification:CMR10">(5,3)</tspan></text> +<g + transform="translate(0,-293.5293)" + id="g72"><path + d="m 264,120 0,0" + inkscape:connector-curvature="0" + id="path74" + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><g + transform="translate(0,293.5293)" + id="g76"><text + transform="matrix(1,0,0,-1,444.1001,-168.0386)" + id="text78"><tspan + x="0 3.8744552 8.8557549 14.940911 19.922211" + y="0" + id="tspan80" + style="font-size:9.96259975px;font-variant:normal;font-weight:normal;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:CMR10;-inkscape-font-specification:CMR10">(9,3)</tspan></text> +<g + transform="translate(0,-293.5293)" + id="g82"><path + d="m 456,120 0,0" + inkscape:connector-curvature="0" + id="path84" + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="M 0,0 528,0" + inkscape:connector-curvature="0" + id="path86" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 0,48 528,0" + inkscape:connector-curvature="0" + id="path88" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 0,96 528,0" + inkscape:connector-curvature="0" + id="path90" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 0,144 528,0" + inkscape:connector-curvature="0" + id="path92" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 0,192 528,0" + inkscape:connector-curvature="0" + id="path94" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 0,240 528,0" + inkscape:connector-curvature="0" + id="path96" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 0,288 528,0" + inkscape:connector-curvature="0" + id="path98" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="M 0,0 0,288" + inkscape:connector-curvature="0" + id="path100" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 48,0 0,288" + inkscape:connector-curvature="0" + id="path102" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 96,0 0,288" + inkscape:connector-curvature="0" + id="path104" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 144,0 0,288" + inkscape:connector-curvature="0" + id="path106" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 192,0 0,288" + inkscape:connector-curvature="0" + id="path108" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 240,0 0,288" + inkscape:connector-curvature="0" + id="path110" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 288,0 0,288" + inkscape:connector-curvature="0" + id="path112" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 336,0 0,288" + inkscape:connector-curvature="0" + id="path114" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 384,0 0,288" + inkscape:connector-curvature="0" + id="path116" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 432,0 0,288" + inkscape:connector-curvature="0" + id="path118" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 480,0 0,288" + inkscape:connector-curvature="0" + id="path120" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 528,0 0,288" + inkscape:connector-curvature="0" + id="path122" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="M 0,288 0,0" + inkscape:connector-curvature="0" + id="path124" + style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="M -1.5304,3.6946 0,0 l 1.5304,3.6946 -3.0608,0 z" + inkscape:connector-curvature="0" + id="path126" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="M 0,0 528,0" + inkscape:connector-curvature="0" + id="path128" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 528,0 0,288" + inkscape:connector-curvature="0" + id="path130" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 0,288 528,0" + inkscape:connector-curvature="0" + id="path132" + style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="M 524.30812,286.47073 528,288 l -3.69188,1.52927 0,-3.05854 z" + inkscape:connector-curvature="0" + id="path134" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><g + transform="translate(0,293.5293)" + id="g136" /></g></g></g></g></g></g></g></g></g></g></g></g></g></g></g></g></svg> No newline at end of file diff --git a/doc/coordinates-2.svg b/doc/coordinates-2.svg new file mode 100644 index 0000000..ffa02d7 --- /dev/null +++ b/doc/coordinates-2.svg @@ -0,0 +1,308 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + width="666.91302" + height="366.91162" + id="svg2" + xml:space="preserve"><metadata + id="metadata8"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs + id="defs6"><clipPath + id="clipPath18"><path + d="m 0,0 533.5304,0 0,293.5293 L 0,293.5293 0,0 z" + inkscape:connector-curvature="0" + id="path20" /></clipPath></defs><g + transform="matrix(1.25,0,0,-1.25,0,366.91162)" + id="g10"><g + id="g12"><g + id="g14"><g + clip-path="url(#clipPath18)" + id="g16"><g + transform="translate(0,293.5293)" + id="g22"><g + transform="translate(3.5304,-291.5293)" + id="g24"><g + transform="translate(0,293.5293)" + id="g26"><text + transform="matrix(1,0,0,-1,12.1001,-24.0386)" + id="text28"><tspan + x="0 3.8744552 8.8557549 14.940911 19.922211" + y="0" + id="tspan30" + style="font-size:9.96259975px;font-variant:normal;font-weight:normal;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:CMR10;-inkscape-font-specification:CMR10">(0,0)</tspan></text> +<g + transform="translate(0,-293.5293)" + id="g32"><path + d="m 24,264 0,0" + inkscape:connector-curvature="0" + id="path34" + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 96,192 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path36" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 96,144 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path38" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 96,96 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path40" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 96,48 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path42" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 144,192 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path44" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 144,144 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path46" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 144,96 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path48" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 144,48 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path50" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 192,192 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path52" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 192,144 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path54" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 192,96 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path56" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 192,48 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path58" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 240,192 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path60" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 240,144 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path62" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 240,96 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path64" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 240,48 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path66" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 288,192 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path68" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 288,144 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path70" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 288,96 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path72" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 288,48 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path74" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 336,192 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path76" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 336,144 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path78" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 336,96 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path80" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 336,48 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path82" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 384,192 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path84" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 384,144 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path86" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 384,96 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path88" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 384,48 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path90" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 432,192 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path92" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 432,144 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path94" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 432,96 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path96" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path + d="m 432,48 48,0 0,48 -48,0 0,-48 z" + inkscape:connector-curvature="0" + id="path98" + style="fill:#99ff99;fill-opacity:1;fill-rule:nonzero;stroke:none" /><g + transform="translate(0,293.5293)" + id="g100"><text + transform="matrix(1,0,0,-1,108.1001,-72.0386)" + id="text102"><tspan + x="0 3.8744552 8.8557549 14.940911 19.922211" + y="0" + id="tspan104" + style="font-size:9.96259975px;font-variant:normal;font-weight:normal;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:CMR10;-inkscape-font-specification:CMR10">(2,1)</tspan></text> +<g + transform="translate(0,-293.5293)" + id="g106"><path + d="m 120,216 0,0" + inkscape:connector-curvature="0" + id="path108" + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><g + transform="translate(0,293.5293)" + id="g110"><text + transform="matrix(1,0,0,-1,444.1001,-216.0386)" + id="text112"><tspan + x="0 3.8744552 8.8557549 14.940911 19.922211" + y="0" + id="tspan114" + style="font-size:9.96259975px;font-variant:normal;font-weight:normal;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:CMR10;-inkscape-font-specification:CMR10">(9,4)</tspan></text> +<g + transform="translate(0,-293.5293)" + id="g116"><path + d="m 456,72 0,0" + inkscape:connector-curvature="0" + id="path118" + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="M 0,0 528,0" + inkscape:connector-curvature="0" + id="path120" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 0,48 528,0" + inkscape:connector-curvature="0" + id="path122" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 0,96 528,0" + inkscape:connector-curvature="0" + id="path124" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 0,144 528,0" + inkscape:connector-curvature="0" + id="path126" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 0,192 528,0" + inkscape:connector-curvature="0" + id="path128" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 0,240 528,0" + inkscape:connector-curvature="0" + id="path130" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 0,288 528,0" + inkscape:connector-curvature="0" + id="path132" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="M 0,0 0,288" + inkscape:connector-curvature="0" + id="path134" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 48,0 0,288" + inkscape:connector-curvature="0" + id="path136" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 96,0 0,288" + inkscape:connector-curvature="0" + id="path138" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 144,0 0,288" + inkscape:connector-curvature="0" + id="path140" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 192,0 0,288" + inkscape:connector-curvature="0" + id="path142" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 240,0 0,288" + inkscape:connector-curvature="0" + id="path144" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 288,0 0,288" + inkscape:connector-curvature="0" + id="path146" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 336,0 0,288" + inkscape:connector-curvature="0" + id="path148" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 384,0 0,288" + inkscape:connector-curvature="0" + id="path150" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 432,0 0,288" + inkscape:connector-curvature="0" + id="path152" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 480,0 0,288" + inkscape:connector-curvature="0" + id="path154" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 528,0 0,288" + inkscape:connector-curvature="0" + id="path156" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="M 0,288 0,0" + inkscape:connector-curvature="0" + id="path158" + style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="M -1.5304,3.6946 0,0 l 1.5304,3.6946 -3.0608,0 z" + inkscape:connector-curvature="0" + id="path160" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="M 0,0 528,0" + inkscape:connector-curvature="0" + id="path162" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 528,0 0,288" + inkscape:connector-curvature="0" + id="path164" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 0,288 528,0" + inkscape:connector-curvature="0" + id="path166" + style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><path + d="M 524.30812,286.47073 528,288 l -3.69188,1.52927 0,-3.05854 z" + inkscape:connector-curvature="0" + id="path168" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" /><g + transform="translate(0,293.5293)" + id="g170" /></g></g></g></g></g></g></g></g></g></g></g></g></svg> No newline at end of file diff --git a/doc/coordinates.mp b/doc/coordinates.mp index 404ff70..c048e6e 100644 --- a/doc/coordinates.mp +++ b/doc/coordinates.mp @@ -1,14 +1,5 @@ -% -% Compile to svg by: -% -% mptopdf coordinates.mp; inkscape -l coordinates-1.svg coordinates-1.pdf -% -beginfig(1) +def draw_grid = % Draw grid - u := 48; - w := 9; - h := 7; - for i=0 upto h: draw (0, i * u) -- (w * u, i * u); endfor @@ -29,12 +20,62 @@ beginfig(1) draw A -- B withpen pencircle scaled 2; draw B -- C withpen pencircle scaled 2; drawarrow D -- C withpen pencircle scaled 4; +enddef; + +vardef pixel_coord(expr x, y) = + px := u/2 + x * u; + py := h * u - u/2 - u * y; + (px,py) +enddef; + +def fill_pixel(expr x, y, col) = + fill unitsquare scaled u shifted pixel_coord(x - 0.5, y + 0.5) withcolor col +enddef; + +beginfig(1) + u = 48; + w = 11; + h = 6; + + % Draw labels + dotlabel.top(btex (0, 0) etex, pixel_coord(0, 0)); + dotlabel.top(btex (w-1, h-1) etex, pixel_coord(w-1, h-1)); + dotlabel.urt(btex (1.5, 2) etex, pixel_coord(1.5, 2)); + + % Draw line + lxs = 5; + lxe = 9; + ly = 3; + for i = lxs upto lxe: + fill_pixel(i, ly, (0.6, 0.6, 1)); + endfor + + dotlabel.top(btex (5, 3) etex, pixel_coord(lxs, ly)); + dotlabel.top(btex (9, 3) etex, pixel_coord(lxe, ly)); + + draw_grid; +endfig; + +beginfig(2) + u := 48; + w := 11; + h := 6; + % Draw labels - dotlabel.top(btex (0, 0) etex, (u/2, h * u - u/2)); - dotlabel.top(btex (w-1, h-1) etex, (w * u - u/2, u/2)); + dotlabel.top(btex (0, 0) etex, pixel_coord(0, 0)); - dotlabel.urt(btex (1.5, 2) etex, (2 * u, h * u - 2 * u - u/2)); + for i = 2 upto 9: + for j = 1 upto 4: + fill_pixel(i, j, (0.6, 1, 0.6)); + endfor + endfor + % Draw rectangle + dotlabel.top(btex (2, 1) etex, pixel_coord(2, 1)); + dotlabel.top(btex (9, 4) etex, pixel_coord(9, 4)); + + draw_grid; endfig; + end diff --git a/doc/gen_mp.sh b/doc/gen_mp.sh new file mode 100755 index 0000000..27c622c --- /dev/null +++ b/doc/gen_mp.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# +# Script to regenerate svgs from metapost +# +# The resulting svg images are stored in git so you need +# to run the script only after you changed the metapost +# source files. +# + +SRC=coordinates + +echo "$SRC.mp -> $SRC-*.pdf" +mptopdf "$SRC.mp" + +for i in $SRC*.pdf; do + SVG=`echo "$i" | sed s/.pdf/.svg/` + echo "$i -> $SVG" + inkscape -l "$SVG" "$i" + rm "$i" +done ----------------------------------------------------------------------- Summary of changes: doc/coordinate_system.txt | 31 ++++- doc/coordinates-1.svg | 320 ++++++++++++++++++++++++++------------------- doc/coordinates-2.svg | 308 +++++++++++++++++++++++++++++++++++++++++++ doc/coordinates.mp | 67 ++++++++-- doc/gen_mp.sh | 20 +++ 5 files changed, 594 insertions(+), 152 deletions(-) create mode 100644 doc/coordinates-2.svg create mode 100755 doc/gen_mp.sh repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: e40b6e745f6ca131059addb2b05297eccf9a474a
by metan 06 Jan '13

06 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via e40b6e745f6ca131059addb2b05297eccf9a474a (commit) from 43abee9f954cd26c59f8da03f3bb40a8e717213f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/e40b6e745f6ca131059addb2b05297eccf9a… commit e40b6e745f6ca131059addb2b05297eccf9a474a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jan 6 11:09:04 2013 +0100 build: Disable implicit rules in build/ dir. This fixes build bug, when you have changed files in several libs/*/ directories and started make (to rebuild the library) from within one of the directories. diff --git a/build/Makefile b/build/Makefile index d384f4c..d4a8b5d 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,5 +1,7 @@ LIB_OBJECTS=$(shell ./get_objs.sh) +.SUFFIXES: + include ../libver.mk LIB_NAME=libGP ----------------------------------------------------------------------- Summary of changes: build/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 43abee9f954cd26c59f8da03f3bb40a8e717213f
by metan 03 Jan '13

03 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 43abee9f954cd26c59f8da03f3bb40a8e717213f (commit) via db29a147f8dcdb75d52c08ca7543c07b6cf6d2f6 (commit) from 482970c5ab94aa39981b016794510d9a445ea93b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/43abee9f954cd26c59f8da03f3bb40a8e717… commit 43abee9f954cd26c59f8da03f3bb40a8e717213f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Jan 3 22:24:46 2013 +0100 backends: X11: Fix stub function. This fixes build without libX11. diff --git a/libs/backends/GP_X11.c b/libs/backends/GP_X11.c index 33a0666..696cc0e 100644 --- a/libs/backends/GP_X11.c +++ b/libs/backends/GP_X11.c @@ -858,7 +858,7 @@ err0: void GP_BackendX11RequestFullscreen(GP_Backend *self, int mode) { - return request_fullscreen(self, mode); + request_fullscreen(self, mode); } #else @@ -875,7 +875,10 @@ GP_Backend *GP_BackendX11Init(const char *GP_UNUSED(display), return NULL; } -void GP_BackendX11RequestFullscreen(GP_Backend *GP_UNUSED(self), int mode); +void GP_BackendX11RequestFullscreen(GP_Backend *GP_UNUSED(self), + int GP_UNUSED(mode)) +{ +} #endif /* HAVE_LIBX11 */ http://repo.or.cz/w/gfxprim.git/commit/db29a147f8dcdb75d52c08ca7543c07b6cf6… commit db29a147f8dcdb75d52c08ca7543c07b6cf6d2f6 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Jan 3 22:23:47 2013 +0100 build: Fix another bug introduced by yesterday. I've confused $? for $^ sorry. diff --git a/build/Makefile b/build/Makefile index 38ce4ca..d384f4c 100644 --- a/build/Makefile +++ b/build/Makefile @@ -23,18 +23,18 @@ endif $(STATIC_LIB): $(LIB_OBJECTS) ifdef VERBOSE - $(AR) rcs $@ $(LIB_OBJECTS) + $(AR) rcs $@ $^ else @echo "AR $@" - @$(AR) rcs $@ $(LIB_OBJECTS) + @$(AR) rcs $@ $^ endif $(DYNAMIC_LIB): $(LIB_OBJECTS) ifdef VERBOSE - $(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(SONAME) $(LIB_OBJECTS) -o $@ + $(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(SONAME) $^ -o $@ else @echo "LD $@" - @$(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(SONAME) $(LIB_OBJECTS) -o $@ + @$(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(SONAME) $^ -o $@ endif $(SYMLINKS): $(DYNAMIC_LIB) diff --git a/lib.mk b/lib.mk index 62bf1b5..2aa9b00 100644 --- a/lib.mk +++ b/lib.mk @@ -36,19 +36,19 @@ OBJS=$(CSOURCES:.c=.o) $(BUILD_DIR)$(DYNAMIC_LIB): $(OBJS) ifdef VERBOSE rm -f $@ - $(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $? -o $@ + $(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $^ -o $@ else @rm -f $(@) @echo "LD $@" - @$(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $? -o $@ + @$(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $^ -o $@ endif $(BUILD_DIR)$(STATIC_LIB): $(OBJS) ifdef VERBOSE - $(AR) rcs $@ $? + $(AR) rcs $@ $^ else @echo "AR $@" - @$(AR) rcs $@ $? + @$(AR) rcs $@ $^ endif $(SYMLINKS): $(BUILD_DIR)$(DYNAMIC_LIB) ----------------------------------------------------------------------- Summary of changes: build/Makefile | 8 ++++---- lib.mk | 8 ++++---- libs/backends/GP_X11.c | 7 +++++-- 3 files changed, 13 insertions(+), 10 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 482970c5ab94aa39981b016794510d9a445ea93b
by metan 03 Jan '13

03 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 482970c5ab94aa39981b016794510d9a445ea93b (commit) from 915c8aa8fc5ebe66b6a9629f57f5d724700c10ac (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/482970c5ab94aa39981b016794510d9a445e… commit 482970c5ab94aa39981b016794510d9a445ea93b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Jan 3 01:44:18 2013 +0100 loaders: png: Load images with alpha channel too. We have limited support for blits with alpha channel and spiv can now show some of the pngs with it. diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index c963794..1c11d54 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -166,15 +166,26 @@ GP_Context *GP_ReadPNG(FILE *f, GP_ProgressCallback *callback) } break; case PNG_COLOR_TYPE_RGB: - + png_set_bgr(png); - + switch (depth) { case 8: pixel_type = GP_PIXEL_RGB888; break; } break; + case PNG_COLOR_TYPE_RGB | PNG_COLOR_MASK_ALPHA: + + png_set_bgr(png); + png_set_swap_alpha(png); + + switch (depth) { + case 8: + pixel_type = GP_PIXEL_RGBA8888; + break; + } + break; case PNG_COLOR_TYPE_PALETTE: /* Grayscale with BPP < 8 is usually saved as palette */ if (png_get_channels(png, png_info) == 1) { @@ -192,14 +203,16 @@ GP_Context *GP_ReadPNG(FILE *f, GP_ProgressCallback *callback) png_set_bgr(png); png_read_update_info(png, png_info); - + png_get_IHDR(png, png_info, &w, &h, &depth, &color_type, NULL, NULL, NULL); - if (color_type & PNG_COLOR_MASK_ALPHA) - pixel_type = GP_PIXEL_UNKNOWN; - else + if (color_type & PNG_COLOR_MASK_ALPHA) { + pixel_type = GP_PIXEL_RGBA8888; + png_set_swap_alpha(png); + } else { pixel_type = GP_PIXEL_RGB888; + } break; } ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_PNG.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 915c8aa8fc5ebe66b6a9629f57f5d724700c10ac
by metan 02 Jan '13

02 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 915c8aa8fc5ebe66b6a9629f57f5d724700c10ac (commit) from af10f6c3b8c240b32ed5cfb4895908b133cdb845 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/915c8aa8fc5ebe66b6a9629f57f5d724700c… commit 915c8aa8fc5ebe66b6a9629f57f5d724700c10ac Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Jan 3 01:19:00 2013 +0100 build: Add forgotten libGP.* dependency. The library dependency on object files was accidentally dropped. Add it back. diff --git a/build/Makefile b/build/Makefile index 5b8a115..38ce4ca 100644 --- a/build/Makefile +++ b/build/Makefile @@ -21,7 +21,7 @@ else @rm -rf $(STATIC_LIB) $(DYNAMIC_LIB) $(SYMLINKS) endif -$(STATIC_LIB): +$(STATIC_LIB): $(LIB_OBJECTS) ifdef VERBOSE $(AR) rcs $@ $(LIB_OBJECTS) else @@ -29,7 +29,7 @@ else @$(AR) rcs $@ $(LIB_OBJECTS) endif -$(DYNAMIC_LIB): +$(DYNAMIC_LIB): $(LIB_OBJECTS) ifdef VERBOSE $(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(SONAME) $(LIB_OBJECTS) -o $@ else ----------------------------------------------------------------------- Summary of changes: build/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: af10f6c3b8c240b32ed5cfb4895908b133cdb845
by metan 02 Jan '13

02 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via af10f6c3b8c240b32ed5cfb4895908b133cdb845 (commit) via 905d21493a6a2ccbc57820084fbca6cd3286df8a (commit) from 14eef5929f17ab225a542656b639e0569ec8af7b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/af10f6c3b8c240b32ed5cfb4895908b133cd… commit af10f6c3b8c240b32ed5cfb4895908b133cdb845 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Jan 2 22:37:09 2013 +0100 build: Remove now unused build knob. diff --git a/config.mk b/config.mk index c65c19d..5a05ef1 100644 --- a/config.mk +++ b/config.mk @@ -13,10 +13,3 @@ PYTHON_INCLUDE=`python-config --include` PYTHON=PYTHONPATH=$$PYTHONPATH:${PYLIBSDIR} ${PYTHON_BIN} -Werror SWIGOPTS=-w322,314 -I/usr/include/ - -# -# If set to yes, rebuilds libGP* after typing make -# in any of the libs/*/ directories that are linked -# to libGP*. -# -REBUILD_LIBGP=yes http://repo.or.cz/w/gfxprim.git/commit/905d21493a6a2ccbc57820084fbca6cd3286… commit 905d21493a6a2ccbc57820084fbca6cd3286df8a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Jan 2 22:36:15 2013 +0100 build: install spiv demo by default. diff --git a/install.sh b/install.sh index b0d3873..f631083 100755 --- a/install.sh +++ b/install.sh @@ -40,3 +40,4 @@ done # Binaries echo "INSTALL binaries" install -m 755 gfxprim-config "$BIN_LOC" +install -m 755 demos/spiv/spiv "$BIN_LOC" ----------------------------------------------------------------------- Summary of changes: config.mk | 7 ------- install.sh | 1 + 2 files changed, 1 insertions(+), 7 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 14eef5929f17ab225a542656b639e0569ec8af7b
by metan 02 Jan '13

02 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 14eef5929f17ab225a542656b639e0569ec8af7b (commit) from 0a1577d93e3b866dda65e0aac1831b015628d4ca (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/14eef5929f17ab225a542656b639e0569ec8… commit 14eef5929f17ab225a542656b639e0569ec8af7b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Jan 2 22:27:11 2013 +0100 build: Fix typo in lib.mk. diff --git a/lib.mk b/lib.mk index 0c5917b..62bf1b5 100644 --- a/lib.mk +++ b/lib.mk @@ -28,27 +28,27 @@ ALL+=$(LIBS) $(SYMLINKS) CLEAN+=$(LIBS) $(addprefix $(BUILD_DIR),$(SYMLINKS)) # -# OBJECTS are set in post.mk so we need to set it here too to have -# correct dependencies we don't care that they are overwritten laten +# OBJECTS are set in post.mk so we need to duplicate the values in +# OBJS here too to have correct dependencies # -OBJECTS=$(CSOURCES=.c=.o) +OBJS=$(CSOURCES:.c=.o) -$(BUILD_DIR)$(DYNAMIC_LIB): $(OBJECTS) +$(BUILD_DIR)$(DYNAMIC_LIB): $(OBJS) ifdef VERBOSE rm -f $@ - $(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $(OBJECTS) -o $@ + $(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $? -o $@ else @rm -f $(@) @echo "LD $@" - @$(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $(OBJECTS) -o $@ + @$(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $? -o $@ endif -$(BUILD_DIR)$(STATIC_LIB): $(OBJECTS) +$(BUILD_DIR)$(STATIC_LIB): $(OBJS) ifdef VERBOSE - $(AR) rcs $@ $(OBJECTS) + $(AR) rcs $@ $? else @echo "AR $@" - @$(AR) rcs $@ $(OBJECTS) + @$(AR) rcs $@ $? endif $(SYMLINKS): $(BUILD_DIR)$(DYNAMIC_LIB) ----------------------------------------------------------------------- Summary of changes: lib.mk | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 0a1577d93e3b866dda65e0aac1831b015628d4ca
by metan 02 Jan '13

02 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 0a1577d93e3b866dda65e0aac1831b015628d4ca (commit) from 388daed53031b9c5e256025809e9d10c3849708c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/0a1577d93e3b866dda65e0aac1831b015628… commit 0a1577d93e3b866dda65e0aac1831b015628d4ca Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Jan 2 22:16:30 2013 +0100 build: Fix the install script. It's a little hacked together but at least it works now. diff --git a/install.sh b/install.sh index c0273e0..b0d3873 100755 --- a/install.sh +++ b/install.sh @@ -3,7 +3,7 @@ INSTALL_PREFIX="$1" if test -z "$INSTALL_PREFIX"; then - INSTALL_PREFIX="/usr/" + INSTALL_PREFIX="/usr" fi HEADER_LOC="$INSTALL_PREFIX/include/" @@ -26,7 +26,16 @@ done # Library echo "INSTALL libraries" install -m 775 -d "$LIB_LOC" -install -m 664 build/*.so build/*.so.0 build/*.a "$LIB_LOC" + +for i in build/*.so build/*.so.* build/*.a; do + if [ -L "$i" ]; then + TARGET=`basename "$i"` + SOURCE=`readlink "$i"` + (cd "$LIB_LOC" && rm -f "$TARGET" && ln -s "$LIB_LOC$SOURCE" "$TARGET") + else + install "$i" "$LIB_LOC" + fi +done # Binaries echo "INSTALL binaries" ----------------------------------------------------------------------- Summary of changes: install.sh | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 388daed53031b9c5e256025809e9d10c3849708c
by metan 02 Jan '13

02 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 388daed53031b9c5e256025809e9d10c3849708c (commit) from 9732f5ac369f2bdf45492cfa4af74092654371aa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/388daed53031b9c5e256025809e9d10c3849… commit 388daed53031b9c5e256025809e9d10c3849708c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Jan 2 21:49:28 2013 +0100 build: Fix library filenames and symlinks. Now libraries have correct realname, soname, etc... diff --git a/build/Makefile b/build/Makefile index 2c1aa01..5b8a115 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,43 +1,48 @@ LIB_OBJECTS=$(shell ./get_objs.sh) -all: libGP.a libGP.so libGP.so.0 +include ../libver.mk -libGP.a: $(LIB_OBJECTS) -libGP.so: $(LIB_OBJECTS) -libGP.so.0: $(LIB_OBJECTS) +LIB_NAME=libGP + +STATIC_LIB=$(LIB_NAME).$(LIB_VERSION).a +DYNAMIC_LIB=$(LIB_NAME).so.$(LIB_VERSION).$(LIB_RELEASE) +SONAME=$(LIB_NAME).so.$(LIB_MAJOR) +SYMLINKS=$(LIB_NAME).so.$(LIB_MAJOR) $(LIB_NAME).so + +all: $(STATIC_LIB) $(DYNAMIC_LIB) $(SYMLINKS) rebuild: all clean: ifdef VERBOSE - rm -rf libGP.a libGP.so libGP.so.0 .lock + rm -rf $(STATIC_LIB) $(DYNAMIC_LIB) $(SYMLINKS) else - @echo "RM libGP.a libGP.so libGP.so.0 .lock" - @rm -rf libGP.a libGP.so libGP.so.0 .lock + @echo "RM $(STATIC_LIB) $(DYNAMIC_LIB) $(SYMLINKS)" + @rm -rf $(STATIC_LIB) $(DYNAMIC_LIB) $(SYMLINKS) endif -libGP.a: +$(STATIC_LIB): ifdef VERBOSE - $(AR) rcs libGP.a $(LIB_OBJECTS) + $(AR) rcs $@ $(LIB_OBJECTS) else - @echo "AR libGP.a" - @$(AR) rcs libGP.a $(LIB_OBJECTS) + @echo "AR $@" + @$(AR) rcs $@ $(LIB_OBJECTS) endif -libGP.so: +$(DYNAMIC_LIB): ifdef VERBOSE - $(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,libGP.so.0 $(LIB_OBJECTS) -o libGP.so + $(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(SONAME) $(LIB_OBJECTS) -o $@ else - @echo "LD libGP.so" - @$(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,libGP.so.0 $(LIB_OBJECTS) -o libGP.so + @echo "LD $@" + @$(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(SONAME) $(LIB_OBJECTS) -o $@ endif -libGP.so.0: libGP.so +$(SYMLINKS): $(DYNAMIC_LIB) ifdef VERBOSE - rm -f libGP.so.0 - ln -s libGP.so libGP.so.0 + rm -f $@ + ln -s $< $@ else - @echo "LN libGP.so.0" - @rm -f libGP.so.0 - @ln -s libGP.so libGP.so.0 + @echo "LN $@" + @rm -f $@ + @ln -s $< $@ endif diff --git a/lib.mk b/lib.mk index 98a7e5a..0c5917b 100644 --- a/lib.mk +++ b/lib.mk @@ -6,34 +6,44 @@ ifndef LIBNAME $(error LIBNAME not defined, fix your library Makefile) endif +ifeq ($(BUILDLIB),yes) # # Rules for single library, applied only when objects # are not linked to the libGP.so. This generates libGP_$(LIBNAME). # -ifeq ($(BUILDLIB),yes) -# BUILDLIB = yes -LIB=libGP_$(LIBNAME) -LIBP=$(TOPDIR)/build/ +include $(TOPDIR)/libver.mk + +LIB_NAME=libGP_$(LIBNAME) +BUILD_DIR=$(TOPDIR)/build/ -ALL+=$(LIBP)$(LIB).so $(LIBP)$(LIB).a -CLEAN+=$(LIBP)$(LIB).so $(LIBP)$(LIB).so.0 $(LIBP)$(LIB).a -OBJS=$(CSOURCES:.c=.o) +STATIC_LIB=$(LIB_NAME).$(LIB_VERSION).a +DYNAMIC_LIB=$(LIB_NAME).so.$(LIB_VERSION).$(LIB_RELEASE) +SONAME=$(LIB_NAME).so.$(LIB_MAJOR) +SYMLINKS=$(LIB_NAME).so.$(LIB_MAJOR) $(LIB_NAME).so +LIBS=$(BUILD_DIR)$(STATIC_LIB) $(BUILD_DIR)$(DYNAMIC_LIB) + +ALL+=$(LIBS) $(SYMLINKS) +CLEAN+=$(LIBS) $(addprefix $(BUILD_DIR),$(SYMLINKS)) + +# +# OBJECTS are set in post.mk so we need to set it here too to have +# correct dependencies we don't care that they are overwritten laten +# +OBJECTS=$(CSOURCES=.c=.o) -$(LIBP)$(LIB).so: $(OBJS) +$(BUILD_DIR)$(DYNAMIC_LIB): $(OBJECTS) ifdef VERBOSE - rm -f $(LIBP)$(LIB).so.0 - cd $(LIBP) && ln -s $(LIB).so $(LIB).so.0 - $(CC) -fPIC --shared -Wl,-soname -Wl,$(LIB).so.0 $(OBJECTS) -o $@ + rm -f $@ + $(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $(OBJECTS) -o $@ else - @rm -f $(LIBP)$(LIB).so.0 - @cd $(LIBP) && ln -s $(LIB).so $(LIB).so.0 + @rm -f $(@) @echo "LD $@" - @$(CC) -fPIC --shared -Wl,-soname -Wl,$(LIB).so.0 $(OBJECTS) -o $@ + @$(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $(OBJECTS) -o $@ endif -$(LIBP)$(LIB).a: $(OBJS) +$(BUILD_DIR)$(STATIC_LIB): $(OBJECTS) ifdef VERBOSE $(AR) rcs $@ $(OBJECTS) else @@ -41,8 +51,21 @@ else @$(AR) rcs $@ $(OBJECTS) endif +$(SYMLINKS): $(BUILD_DIR)$(DYNAMIC_LIB) +ifdef VERBOSE + rm -f $(BUILD_DIR)$@ + cd $(BUILD_DIR) && ln -s $(DYNAMIC_LIB) $@ +else + @echo "LN $@" + @rm -f $(BUILD_DIR)$@ + @cd $(BUILD_DIR) && ln -s $(DYNAMIC_LIB) $@ +endif + else -# BUILDLIB = no +# +# If we are not executed from the top Makefile, trigger +# libGP.so rebuild. +# include $(TOPDIR)/config.mk ifndef TOP_MAKE diff --git a/libver.mk b/libver.mk new file mode 100644 index 0000000..747c7b4 --- /dev/null +++ b/libver.mk @@ -0,0 +1,10 @@ +# +# Contains GFXprim library version used +# for library names, soname etc +# + +LIB_MAJOR=0 +LIB_MINOR=0 +LIB_RELEASE=0 + +LIB_VERSION=$(LIB_MAJOR).$(LIB_MINOR) ----------------------------------------------------------------------- Summary of changes: build/Makefile | 47 ++++++++++++++++++++++++++--------------------- lib.mk | 55 +++++++++++++++++++++++++++++++++++++++---------------- libver.mk | 10 ++++++++++ 3 files changed, 75 insertions(+), 37 deletions(-) create mode 100644 libver.mk repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 9732f5ac369f2bdf45492cfa4af74092654371aa
by metan 02 Jan '13

02 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 9732f5ac369f2bdf45492cfa4af74092654371aa (commit) via fbf455bd345b12cb63ba51b4b0667412f115ae69 (commit) from 6cc070b5aeb9f343e31567748ba8ad8a1731261c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/9732f5ac369f2bdf45492cfa4af740926543… commit 9732f5ac369f2bdf45492cfa4af74092654371aa Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Jan 2 20:39:48 2013 +0100 build: Update lists of exported symbols. diff --git a/build/syms/Core_symbols.txt b/build/syms/Core_symbols.txt index 3de2293..72ee71f 100644 --- a/build/syms/Core_symbols.txt +++ b/build/syms/Core_symbols.txt @@ -12,11 +12,13 @@ GP_ContextFree GP_ContextInit GP_SubContext GP_ContextCopy +GP_ContextEqual GP_PixelAddrOffset GP_GammaRelease GP_GammaCopy GP_GammaAcquire +GP_GammaPrint GP_DebugPrint GP_SetDebugLevel @@ -43,14 +45,14 @@ GP_BlitXYXY_Raw GP_WritePixels_1BPP_LE GP_WritePixels_2BPP_LE GP_WritePixels_4BPP_LE -GP_WritePixels1bpp -GP_WritePixels2bpp -GP_WritePixels4bpp -GP_WritePixels8bpp -GP_WritePixels16bpp -GP_WritePixels18bpp -GP_WritePixels32bpp -GP_WritePixels24bpp +GP_WritePixels_1BPP_BE +GP_WritePixels_2BPP_BE +GP_WritePixels_4BPP_BE +GP_WritePixels_8BPP +GP_WritePixels_16BPP +GP_WritePixels_18BPP_LE +GP_WritePixels_24BPP +GP_WritePixels_32BPP GP_PutPixel GP_GetPixel diff --git a/build/syms/GFX_symbols.txt b/build/syms/GFX_symbols.txt index d6ed889..c3566ae 100644 --- a/build/syms/GFX_symbols.txt +++ b/build/syms/GFX_symbols.txt @@ -1,9 +1,21 @@ +GP_Line GP_Line_Raw +GP_LineAA +GP_LineAA_Raw +GP_LineClip + GP_Line_Raw_4BPP_LE GP_Line_Raw_2BPP_BE -GP_HLine_Raw_32BPP -GP_LineAA GP_Line_Raw_32BPP +GP_Line_Raw_8BPP +GP_Line_Raw_2BPP_LE +GP_Line_Raw_16BPP +GP_Line_Raw_24BPP +GP_Line_Raw_18BPP_LE +GP_Line_Raw_1BPP_LE +GP_Line_Raw_4BPP_BE +GP_Line_Raw_1BPP_BE + GP_HLineXYW_Raw GP_HLine_Raw_8BPP GP_HLineAA @@ -12,24 +24,15 @@ GP_HLine_Raw_1BPP_LE GP_HLine_Raw_4BPP_BE GP_HLine_Raw_2BPP_BE GP_HLine_Raw_24BPP -GP_Line_Raw_24BPP -GP_Line_Raw_1BPP_BE +GP_HLine_Raw_32BPP GP_HLineXXY GP_HLine_Raw_4BPP_LE -GP_Line_Raw_18BPP_LE -GP_Line_Raw_1BPP_LE -GP_Line_Raw_4BPP_BE GP_HLineXXY_Raw GP_HLine_Raw_1BPP_BE -GP_Line -GP_Line_Raw_8BPP -GP_Line_Raw_2BPP_LE -GP_HLine_Raw_18BPP_LE -GP_HLineAA_Raw -GP_Line_Raw_16BPP GP_HLine_Raw_2BPP_LE GP_HLine_Raw_16BPP -GP_LineAA_Raw +GP_HLine_Raw_18BPP_LE +GP_HLineAA_Raw GP_VLineXYY_Raw GP_VLineAA http://repo.or.cz/w/gfxprim.git/commit/fbf455bd345b12cb63ba51b4b0667412f115… commit fbf455bd345b12cb63ba51b4b0667412f115ae69 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Jan 2 01:26:43 2013 +0100 doc: context: Fix subcontext desc, add link to dithering. diff --git a/doc/context.txt b/doc/context.txt index b973f91..df6ff47 100644 --- a/doc/context.txt +++ b/doc/context.txt @@ -217,17 +217,19 @@ Subcontext ~~~~~~~~~~ A subcontext is a context that refers to a rectangular area within another -context. Subcontexts can be used as any other context (including creating -another subcontexts). Generally the subcontexts behave exactly as any other -contexts with one exception, if you create several overlapping subcontexts the -results may be unexpected. - -Calling 'GP_ContextFree()' on a allocated subcontext is safe; the bitmap is not -freed as it belongs to another context; it will be freed with the hosting -context (i.e. the 'free_pixels' flag is not set when creating subcontext). On -the other hand, the subcontext doesn't hold a reference to the original -context, so once the parent context is freed the subcontext pixel pointer is -not valid anymore. +context. Subcontexts can be used as any other contexts (including subcontext +creation). + +WARNING: If you create overlaping subcontexts the result is undefined. + +Calling 'GP_ContextFree()' on a allocated subcontext is safe; the bitmap is +not freed as it belongs to another context; it will be freed when the parent +context is freed (i.e. the 'free_pixels' flag is not set when creating +subcontext). + +CAUTION: The subcontext doesn't hold a reference to the original context, so + once the parent context is freed the subcontext pixels pointer is not + valid anymore. [source,c] ------------------------------------------------------------------------------- @@ -242,7 +244,8 @@ GP_Context *GP_SubContextAlloc(const GP_Context *context, GP_Coord x, GP_Coord y, GP_Size w, GP_Size h); ------------------------------------------------------------------------------- -Creates subcontext of a context. The rectangular area must fit into the context. +Creates subcontext of a context. The rectangular area must fit into the parent +context. The 'GP_SubContext()' function initializes the passed pointer as a subcontext of a context and returns pointer to the initialized subcontext (i.e. the same @@ -273,7 +276,7 @@ Converts a context to different pixel type. This is naive implementation that only multiplies/divides the pixel values. -To get a better result use dithering filters instead. +To get a better result use link:filters.html#Dithering[dithering filters] instead. Misc ~~~~ diff --git a/doc/filters.txt b/doc/filters.txt index d15b3aa..dba963e 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -926,6 +926,7 @@ downscaling. To do this reasonably fast we could cheat a little: first resize big images a little without the low-pass filter, then apply low-pass filter and finally downscale it to desired size. +[[Dithering]] Dithering ~~~~~~~~~ ----------------------------------------------------------------------- Summary of changes: build/syms/Core_symbols.txt | 18 ++++++++++-------- build/syms/GFX_symbols.txt | 31 +++++++++++++++++-------------- doc/context.txt | 29 ++++++++++++++++------------- doc/filters.txt | 1 + 4 files changed, 44 insertions(+), 35 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0