From 14f8742aaee931259dd8c3ea314e318dd0b880b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Br=C3=BCschweiler?= Date: Tue, 1 Jun 2010 13:52:00 +0200 Subject: [PATCH] ui.render: set pack alignment to 1, so padding images isn't needed anymore --- basis/images/png/png.factor | 10 +--------- basis/ui/render/render.factor | 2 ++ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/basis/images/png/png.factor b/basis/images/png/png.factor index d4a9c4ab56..0b46fdf653 100644 --- a/basis/images/png/png.factor +++ b/basis/images/png/png.factor @@ -290,14 +290,6 @@ ERROR: invalid-color-type/bit-depth loading-png ; : validate-truecolor-alpha ( loading-png -- loading-png ) { 8 16 } validate-bit-depth ; -: pad-bitmap ( image -- image ) - dup dim>> second 4 divisor? [ - dup [ bytes-per-pixel ] - [ dim>> first * ] - [ dim>> first 4 mod ] tri - '[ _ group [ _ 0 append ] map B{ } concat-as ] change-bitmap - ] unless ; - : loading-png>bitmap ( loading-png -- bytes component-order ) dup color-type>> { { greyscale [ @@ -323,7 +315,7 @@ ERROR: invalid-color-type/bit-depth loading-png ; [ loading-png>bitmap [ >>bitmap ] [ >>component-order ] bi* ] [ [ width>> ] [ height>> ] bi 2array >>dim ] [ png-component >>component-type ] - } cleave pad-bitmap ; + } cleave ; : load-png ( stream -- loading-png ) [ diff --git a/basis/ui/render/render.factor b/basis/ui/render/render.factor index 8ce9074225..84edbc35c3 100644 --- a/basis/ui/render/render.factor +++ b/basis/ui/render/render.factor @@ -35,6 +35,8 @@ SLOT: background-color GL_BLEND glEnable GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA glBlendFunc GL_VERTEX_ARRAY glEnableClientState + GL_PACK_ALIGNMENT 1 glPixelStorei + GL_UNPACK_ALIGNMENT 1 glPixelStorei init-matrices [ init-clip ] [