DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify imagemagick conversion

Browse Source
This commit is contained in:
Dave Murphy 2015-02-18 15:06:09 +00:00
parent 6be71c218e
commit 257f77a05d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/graphics/bitmap/24bit-color/Makefile
View File

@ -94,7 +94,7 @@ endif
#---------------------------------------------------------------------------------
export OFILES := $(addsuffix .o,$(BINFILES)) \
$(PNGFILES:.png=.rgb.o) \
$(PNGFILES:.png=.bgr.o) \
$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) \
export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
@ -172,16 +172,16 @@ $(OUTPUT).elf : $(OFILES)
#---------------------------------------------------------------------------------
%.rgb.o: %.rgb
%.bgr.o: %.bgr
#---------------------------------------------------------------------------------
@echo $(notdir $<)
@$(bin2o)
#---------------------------------------------------------------------------------
%.rgb: %.png
%.bgr: %.png
#---------------------------------------------------------------------------------
@echo $(notdir $<)
@convert $< -channel B -separate $< -channel G -separate $< -channel R -separate -channel RGB -combine -rotate 90 $@
@convert $< -rotate 90 $@
-include $(DEPENDS)

4
examples/graphics/bitmap/24bit-color/source/main.c
View File

@ -17,7 +17,7 @@
#include <string.h>
//This include a header containing definitions of our image
#include "brew_rgb.h"
#include "brew_bgr.h"
int main(int argc, char **argv)
{
@ -37,7 +37,7 @@ int main(int argc, char **argv)
u8* fb = gfxGetFramebuffer(GFX_BOTTOM, GFX_LEFT, NULL, NULL);
//Copy our image in the bottom screen's frame buffer
memcpy(fb, brew_rgb, brew_rgb_size);
memcpy(fb, brew_bgr, brew_bgr_size);
// Main loop
while (aptMainLoop())