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.

Sign up for GitHub

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

Jump to bottom

Implementation of a TIM2 coder #1571

Merged
merged 14 commits into from Jul 13, 2019
Merged

Implementation of a TIM2 coder #1571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b0bd8a5
Added ScaleColor4to8 and converse functions
Qjammer May 4, 2019
2826ea8
Implementation mostly done
Qjammer May 5, 2019
617f280
Build setup
Qjammer May 5, 2019
211e434
reordered processing of clut and pixels
Qjammer May 5, 2019
c8aa90d
Added support for Shuffled CLUTs
Qjammer May 6, 2019
cdd42c7
Revert "Added ScaleColor4to8 and converse functions"
Qjammer May 6, 2019
3be8df4
Added more exceptions thrown when header is incorrect
Qjammer May 6, 2019
2b3d79e
created enums and compacted rgb read functions
Qjammer May 7, 2019
2f1bdc7
Added alpha channel and changed alpha scaling
Qjammer May 12, 2019
a14807f
Added support for format_type==1
Qjammer May 12, 2019
a4feffc
New define for assigning clut colors
Qjammer May 13, 2019
6a69716
Changed names to avoid namespace conflicts
Qjammer May 14, 2019
f9a27a6
Fixed alpha channel of RGB24 encoding
Qjammer May 15, 2019
d02c16c
Incorporated sanity check into the switch
Qjammer May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions MagickCore/static.h
View file
Open in desktop
Expand Up @@ -169,6 +169,7 @@ extern ModuleExport size_t
RegisterTIFFImage(void),
RegisterTILEImage(void),
RegisterTIMImage(void),
RegisterTIM2Image(void),
RegisterTTFImage(void),
RegisterTXTImage(void),
RegisterUILImage(void),
Expand Down Expand Up @@ -334,6 +335,7 @@ extern ModuleExport void
UnregisterTIFFImage(void),
UnregisterTILEImage(void),
UnregisterTIMImage(void),
UnregisterTIM2Image(void),
UnregisterTTFImage(void),
UnregisterTXTImage(void),
UnregisterUILImage(void),
Expand Down
3 changes: 2 additions & 1 deletion coders/Make.com
View file
Open in desktop
Expand Up @@ -121,6 +121,7 @@ $call Make thumbnail.c
$call Make tiff.c
$call Make tile.c
$call Make tim.c
$call Make tim2.c
$call Make ttf.c
$call Make txt.c
$call Make uil.c
Expand Down Expand Up @@ -155,7 +156,7 @@ $library/create libCoders.olb aai,art,avs,bgr,bmp,braille,clip,clipboard,cip, -
jnx,json,hdr,label,cals,caption,palm,mac,magick,map,mat,matte,pango,rgf, -
meta,miff,mpc,mpr,msl,mpeg,mono,mtv,mvg,null,otb,pattern,pcd,pcl,pcx,pdb, -
pdf,pes,pict,pix,plasma,png,pnm,preview,ps,ps2,ps3,psd,pwp,raw,rgb,rla,rle, -
sct,sfw,sgi,stegano,sun,svg,tga,thumbnail,tiff,tile,tim,ttf,txt,uil,url, -
sct,sfw,sgi,stegano,sun,svg,tga,thumbnail,tiff,tile,tim,tim2,ttf,txt,uil,url, -
uyvy,vicar,vid,viff,wbmp,webp,wmf,wpg,x,xbm,xc,xcf,xpm,xps,xwd,ycbcr,yuv, -
mask,screenshot,vips,sixel,xtrn, -
cin,magick,scr,[-.magickcore]compress,[-.magickcore]prervicccm
Expand Down
9 changes: 9 additions & 0 deletions coders/Makefile.am
View file
Open in desktop
Expand Up @@ -190,6 +190,7 @@ MAGICKCORE_CODER_SRCS = \
coders/thumbnail.c \
coders/tile.c \
coders/tim.c \
coders/tim2.c \
coders/ttf.c \
coders/txt.c \
coders/uil.c \
Expand Down Expand Up @@ -336,6 +337,7 @@ CODERS_NOINST_HDRS = \
coders/tiff.h \
coders/tile.h \
coders/tim.h \
coders/tim2.h \
coders/ttf.h \
coders/txt.h \
coders/uil.h \
Expand Down Expand Up @@ -453,6 +455,7 @@ coders_LTLIBRARIES = \
coders/thumbnail.la \
coders/tile.la \
coders/tim.la \
coders/tim2.la \
coders/ttf.la \
coders/txt.la \
coders/uil.la \
Expand Down Expand Up @@ -1121,6 +1124,12 @@ coders_tim_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
coders_tim_la_LDFLAGS = $(MODULECOMMONFLAGS)
coders_tim_la_LIBADD = $(MAGICKCORE_LIBS)

# TIM2 coder module
coders_tim2_la_SOURCES = coders/tim2.c
coders_tim2_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
coders_tim2_la_LDFLAGS = $(MODULECOMMONFLAGS)
coders_tim2_la_LIBADD = $(MAGICKCORE_LIBS)

# TTF coder module
coders_ttf_la_SOURCES = coders/ttf.c
coders_ttf_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
Expand Down
1 change: 1 addition & 0 deletions coders/coders-list.h
View file
Open in desktop
Expand Up @@ -150,6 +150,7 @@ AddMagickCoder(THUMBNAIL)
#endif
AddMagickCoder(TILE)
AddMagickCoder(TIM)
AddMagickCoder(TIM2)
#if defined(MAGICKCORE_FREETYPE_DELEGATE)
AddMagickCoder(TTF)
#endif
Expand Down
1 change: 1 addition & 0 deletions coders/coders.h
View file
Open in desktop
Expand Up @@ -153,6 +153,7 @@
#endif
#include "coders/tile.h"
#include "coders/tim.h"
#include "coders/tim2.h"
#if defined(MAGICKCORE_FREETYPE_DELEGATE)
#include "coders/ttf.h"
#endif
Expand Down