diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7b1e4908c68..e045f948eb5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,6 +20,7 @@ jobs: - name: Install rgbds working-directory: rgbds run: | + sudo apt-get install -yq libpng-dev sudo make install cd .. rm -rf rgbds diff --git a/Makefile b/Makefile index 8d8af26e108..82ed37977bc 100644 --- a/Makefile +++ b/Makefile @@ -207,15 +207,49 @@ gfx/pokemon/girafarig/front.animated.tilemap: gfx/pokemon/girafarig/front.2bpp g tools/pokemon_animation_graphics --girafarig -t $@ $^ -### Misc file-specific graphics rules +### Pokemon and trainer sprite rules + +gfx/pokemon/%/back.2bpp: rgbgfx += --columns +gfx/pokemon/%/back.2bpp: gfx/pokemon/%/back.png gfx/pokemon/%/normal.gbcpal + $(RGBGFX) $(rgbgfx) --colors gbc:$(word 2,$^) -o $@ $< +gfx/pokemon/%/front.2bpp: gfx/pokemon/%/front.png gfx/pokemon/%/normal.gbcpal + $(RGBGFX) $(rgbgfx) --colors gbc:$(word 2,$^) -o $@ $< +gfx/pokemon/%/normal.gbcpal: gfx/pokemon/%/front.gbcpal gfx/pokemon/%/back.gbcpal + tools/gbcpal $(tools/gbcpal) $@ $^ + +gfx/trainers/%.2bpp: rgbgfx += --columns +gfx/trainers/%.2bpp: gfx/trainers/%.png gfx/trainers/%.gbcpal + $(RGBGFX) $(rgbgfx) --colors gbc:$(word 2,$^) -o $@ $< + +# Egg does not have a back sprite, so it only uses front.gbcpal +gfx/pokemon/egg/front.2bpp: gfx/pokemon/egg/front.png gfx/pokemon/egg/front.gbcpal +gfx/pokemon/egg/front.2bpp: rgbgfx += --colors gbc:$(word 2,$^) + +# Unown letters share one normal.gbcpal +unown_pngs := $(wildcard gfx/pokemon/unown_*/front.png) $(wildcard gfx/pokemon/unown_*/back.png) +$(foreach png, $(unown_pngs),\ + $(eval $(png:.png=.2bpp): $(png) gfx/pokemon/unown/normal.gbcpal)) +gfx/pokemon/unown_%/back.2bpp: rgbgfx += --colors gbc:$(word 2,$^) +gfx/pokemon/unown_%/front.2bpp: rgbgfx += --colors gbc:$(word 2,$^) +gfx/pokemon/unown/normal.gbcpal: $(subst .png,.gbcpal,$(unown_pngs)) + tools/gbcpal $(tools/gbcpal) $@ $^ -gfx/pokemon/%/back.2bpp: rgbgfx += --columns --colors embedded -gfx/pokemon/%/front.2bpp: rgbgfx += --colors embedded -gfx/trainers/%.2bpp: rgbgfx += --columns --colors embedded +### Misc file-specific graphics rules gfx/pokemon/egg/unused_front.2bpp: rgbgfx += --columns +gfx/pokemon/spearow/normal.gbcpal: tools/gbcpal += --reverse +gfx/pokemon/fearow/normal.gbcpal: tools/gbcpal += --reverse +gfx/pokemon/farfetch_d/normal.gbcpal: tools/gbcpal += --reverse +gfx/pokemon/hitmonlee/normal.gbcpal: tools/gbcpal += --reverse +gfx/pokemon/scyther/normal.gbcpal: tools/gbcpal += --reverse +gfx/pokemon/jynx/normal.gbcpal: tools/gbcpal += --reverse +gfx/pokemon/porygon/normal.gbcpal: tools/gbcpal += --reverse +gfx/pokemon/porygon2/normal.gbcpal: tools/gbcpal += --reverse + +gfx/trainers/swimmer_m.gbcpal: tools/gbcpal += --reverse + gfx/new_game/shrink1.2bpp: rgbgfx += --columns gfx/new_game/shrink2.2bpp: rgbgfx += --columns @@ -305,15 +339,16 @@ gfx/mobile/stadium2_n64.2bpp: tools/gfx += --trim-whitespace %.2bpp: %.png $(RGBGFX) $(rgbgfx) -o $@ $< $(if $(tools/gfx),\ - tools/gfx $(tools/gfx) -o $@ $@) + tools/gfx $(tools/gfx) -o $@ $@ || $$($(RM) $@ && false)) %.1bpp: %.png $(RGBGFX) $(rgbgfx) --depth 1 -o $@ $< $(if $(tools/gfx),\ - tools/gfx $(tools/gfx) --depth 1 -o $@ $@) + tools/gfx $(tools/gfx) --depth 1 -o $@ $@ || $$($(RM) $@ && false)) %.gbcpal: %.png - $(RGBGFX) --colors embedded -p $@ $< + $(RGBGFX) -p $@ $< + tools/gbcpal $(tools/gbcpal) $@ $@ || $$($(RM) $@ && false) %.dimensions: %.png tools/png_dimensions $< $@ diff --git a/constants/map_constants.asm b/constants/map_constants.asm index e24d04ce18d..55befd2f7ea 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -349,7 +349,7 @@ ENDM map_const FUCHSIA_MART, 6, 4 ; 6 map_const SAFARI_ZONE_MAIN_OFFICE, 4, 4 ; 7 map_const FUCHSIA_GYM, 5, 9 ; 8 - map_const BILLS_BROTHERS_HOUSE, 4, 4 ; 9 + map_const BILLS_OLDER_SISTERS_HOUSE, 4, 4 ; 9 map_const FUCHSIA_POKECENTER_1F, 5, 4 ; 10 map_const FUCHSIA_POKECENTER_2F_BETA, 8, 4 ; 11 map_const SAFARI_ZONE_WARDENS_HOME, 5, 4 ; 12 diff --git a/data/battle_tower/parties.asm b/data/battle_tower/parties.asm index d972944b656..5cab2ac76d7 100644 --- a/data/battle_tower/parties.asm +++ b/data/battle_tower/parties.asm @@ -8,7 +8,7 @@ BattleTowerMons: db MIRACLEBERRY db THUNDERBOLT, HYPER_BEAM, SHADOW_BALL, ROAR dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 50000 bigdw 40000 @@ -34,7 +34,7 @@ BattleTowerMons: db LEFTOVERS db MUD_SLAP, PSYCHIC_M, PSYCH_UP, TOXIC dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 40000 bigdw 50000 @@ -60,7 +60,7 @@ BattleTowerMons: db GOLD_BERRY db SHADOW_BALL, IRON_TAIL, PSYCH_UP, TOXIC dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 40000 bigdw 40000 @@ -86,7 +86,7 @@ BattleTowerMons: db FOCUS_BAND db COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -112,7 +112,7 @@ BattleTowerMons: db MIRACLEBERRY db REVERSAL, HYPER_BEAM, EARTHQUAKE, ATTRACT dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 40000 bigdw 30000 @@ -138,7 +138,7 @@ BattleTowerMons: db SCOPE_LENS db SURF, PSYCHIC_M, RECOVER, ANCIENTPOWER dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 40000 bigdw 30000 @@ -164,7 +164,7 @@ BattleTowerMons: db GOLD_BERRY db BLIZZARD, EARTHQUAKE, HYPER_BEAM, TOXIC dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -190,7 +190,7 @@ BattleTowerMons: db LEFTOVERS db HYPER_BEAM, SUPERSONIC, EARTHQUAKE, BITE dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -216,7 +216,7 @@ BattleTowerMons: db MIRACLEBERRY db BLIZZARD, SURF, THUNDERBOLT, PSYCHIC_M dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -242,7 +242,7 @@ BattleTowerMons: db GOLD_BERRY db SLASH, FAINT_ATTACK, SURF, BLIZZARD dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 30000 bigdw 35000 @@ -268,7 +268,7 @@ BattleTowerMons: db BRIGHTPOWDER db PSYCHIC_M, BLIZZARD, HYPER_BEAM, TRI_ATTACK dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -294,7 +294,7 @@ BattleTowerMons: db FOCUS_BAND db PERISH_SONG, MEAN_LOOK, PAIN_SPLIT, SHADOW_BALL dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -320,7 +320,7 @@ BattleTowerMons: db GOLD_BERRY db FAINT_ATTACK, SOLARBEAM, ROAR, SUNNY_DAY dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -346,7 +346,7 @@ BattleTowerMons: db KINGS_ROCK db PSYBEAM, MUD_SLAP, SHADOW_BALL, AGILITY dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -372,7 +372,7 @@ BattleTowerMons: db QUICK_CLAW db HEADBUTT, SOLARBEAM, ROLLOUT, STRENGTH dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 32000 bigdw 40000 @@ -398,7 +398,7 @@ BattleTowerMons: db MIRACLEBERRY db HEADBUTT, PROTECT, SNORE, SURF dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -424,7 +424,7 @@ BattleTowerMons: db KINGS_ROCK db TOXIC, GIGA_DRAIN, THIEF, CONFUSION dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -450,7 +450,7 @@ BattleTowerMons: db GOLD_BERRY db REVERSAL, ENDURE, COUNTER, ROCK_SMASH dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -476,7 +476,7 @@ BattleTowerMons: db BERRY db HIDDEN_POWER, 0, 0, 0 dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -502,7 +502,7 @@ BattleTowerMons: db KINGS_ROCK db HEADBUTT, SWAGGER, TAIL_WHIP, ICY_WIND dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -528,7 +528,7 @@ BattleTowerMons: db QUICK_CLAW db TOXIC, PSYCH_UP, FIRE_PUNCH, HEADBUTT dw 0 ; OT ID - dt 1000 ; Exp + bigdt 1000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -557,7 +557,7 @@ BattleTowerMons: db LEFTOVERS db PROTECT, TOXIC, MUD_SLAP, ATTRACT dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -583,7 +583,7 @@ BattleTowerMons: db GOLD_BERRY db RECOVER, PSYCHIC_M, SURF, PSYCH_UP dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -609,7 +609,7 @@ BattleTowerMons: db MIRACLEBERRY db HYPER_BEAM, DRAGON_RAGE, THUNDERBOLT, FIRE_BLAST dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -635,7 +635,7 @@ BattleTowerMons: db GOLD_BERRY db ROAR, IRON_TAIL, SWAGGER, EARTHQUAKE dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -661,7 +661,7 @@ BattleTowerMons: db BERRY_JUICE db PSYCHIC_M, PSYCH_UP, TOXIC, THUNDERPUNCH dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -687,7 +687,7 @@ BattleTowerMons: db BRIGHTPOWDER db FLAMETHROWER, ROAR, HYPER_BEAM, IRON_TAIL dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 35000 bigdw 45000 @@ -713,7 +713,7 @@ BattleTowerMons: db FOCUS_BAND db ENDURE, REVERSAL, MEGAHORN, EARTHQUAKE dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 50000 bigdw 30000 @@ -739,7 +739,7 @@ BattleTowerMons: db LEFTOVERS db HYPER_BEAM, PSYCHIC_M, TOXIC, DREAM_EATER dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -765,7 +765,7 @@ BattleTowerMons: db GOLD_BERRY db REST, HYPER_BEAM, EARTHQUAKE, DRAGON_RAGE dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -791,7 +791,7 @@ BattleTowerMons: db BRIGHTPOWDER db PSYCHIC_M, SUBMISSION, SOFTBOILED, COUNTER dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -817,7 +817,7 @@ BattleTowerMons: db GOLD_BERRY db PSYCHIC_M, THUNDERBOLT, BLIZZARD, CONFUSE_RAY dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 55000 bigdw 30000 @@ -843,7 +843,7 @@ BattleTowerMons: db LIGHT_BALL db THUNDERBOLT, THUNDER_WAVE, STRENGTH, TOXIC dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -869,7 +869,7 @@ BattleTowerMons: db FOCUS_BAND db STEEL_WING, SLASH, TOXIC, SANDSTORM dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 40000 bigdw 45000 @@ -895,7 +895,7 @@ BattleTowerMons: db GOLD_BERRY db THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH, MEGA_PUNCH dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -921,7 +921,7 @@ BattleTowerMons: db BRIGHTPOWDER db THUNDERBOLT, EARTHQUAKE, HYPER_BEAM, BLIZZARD dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 50000 bigdw 40000 @@ -947,7 +947,7 @@ BattleTowerMons: db MYSTIC_WATER db SURF, BLIZZARD, ATTRACT, RAIN_DANCE dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 40000 bigdw 40000 @@ -973,7 +973,7 @@ BattleTowerMons: db KINGS_ROCK db EARTHQUAKE, THUNDER, ATTRACT, SURF dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 40000 bigdw 40000 @@ -999,7 +999,7 @@ BattleTowerMons: db GOLD_BERRY db HYPER_BEAM, BLIZZARD, FIRE_BLAST, ATTRACT dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 40000 bigdw 40000 @@ -1025,7 +1025,7 @@ BattleTowerMons: db PINK_BOW db PSYCHIC_M, SWAGGER, PSYCH_UP, HEADBUTT dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -1051,7 +1051,7 @@ BattleTowerMons: db BERRY db BLIZZARD, EARTHQUAKE, SURF, THUNDERPUNCH dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -1077,7 +1077,7 @@ BattleTowerMons: db QUICK_CLAW db AMNESIA, EARTHQUAKE, SURF, RAIN_DANCE dw 0 ; OT ID - dt 8000 ; Exp + bigdt 8000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -1106,7 +1106,7 @@ BattleTowerMons: db MIRACLEBERRY db THUNDERBOLT, THUNDER_WAVE, ROAR, MUD_SLAP dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -1132,7 +1132,7 @@ BattleTowerMons: db BRIGHTPOWDER db DOUBLE_TEAM, SURF, FISSURE, SUBMISSION dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 50000 bigdw 55000 @@ -1158,7 +1158,7 @@ BattleTowerMons: db LEFTOVERS db THUNDER_WAVE, PSYCHIC_M, RECOVER, SURF dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -1184,7 +1184,7 @@ BattleTowerMons: db GOLD_BERRY db BLIZZARD, LOVELY_KISS, DREAM_EATER, ATTRACT dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -1210,7 +1210,7 @@ BattleTowerMons: db KINGS_ROCK db EARTHQUAKE, SLUDGE_BOMB, SLASH, MUD_SLAP dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -1236,7 +1236,7 @@ BattleTowerMons: db BRIGHTPOWDER db GIGA_DRAIN, SUNNY_DAY, SOLARBEAM, DOUBLE_TEAM dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 45000 bigdw 45000 @@ -1262,7 +1262,7 @@ BattleTowerMons: db LEFTOVERS db TOXIC, REFLECT, SOFTBOILED, PROTECT dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 50000 bigdw 30000 @@ -1288,7 +1288,7 @@ BattleTowerMons: db CHARCOAL db FLAMETHROWER, CRUNCH, SHADOW_BALL, DREAM_EATER dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -1314,7 +1314,7 @@ BattleTowerMons: db MIRACLEBERRY db CROSS_CHOP, ICE_PUNCH, EARTHQUAKE, FIRE_BLAST dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -1340,7 +1340,7 @@ BattleTowerMons: db GOLD_BERRY db ATTRACT, CONFUSE_RAY, TOXIC, WING_ATTACK dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -1366,7 +1366,7 @@ BattleTowerMons: db BRIGHTPOWDER db PSYCHIC_M, RECOVER, HYPER_BEAM, TRI_ATTACK dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 55000 bigdw 30000 @@ -1392,7 +1392,7 @@ BattleTowerMons: db THICK_CLUB db EARTHQUAKE, RETURN, HYPER_BEAM, BONEMERANG dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -1418,7 +1418,7 @@ BattleTowerMons: db BRIGHTPOWDER db LIGHT_SCREEN, THUNDERBOLT, PROTECT, THUNDER dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 40000 bigdw 45000 @@ -1444,7 +1444,7 @@ BattleTowerMons: db LEFTOVERS db RAIN_DANCE, WATER_GUN, ICY_WIND, STRENGTH dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -1470,7 +1470,7 @@ BattleTowerMons: db GOLD_BERRY db RAIN_DANCE, THUNDER, SURF, FLAIL dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 50000 bigdw 40000 @@ -1496,7 +1496,7 @@ BattleTowerMons: db MIRACLEBERRY db CONFUSION, SWIFT, TOXIC, PSYCH_UP dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -1522,7 +1522,7 @@ BattleTowerMons: db KINGS_ROCK db WRAP, TOXIC, SLUDGE_BOMB, BUBBLEBEAM dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -1548,7 +1548,7 @@ BattleTowerMons: db GOLD_BERRY db THIEF, LICK, NIGHT_SHADE, GIGA_DRAIN dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -1574,7 +1574,7 @@ BattleTowerMons: db GOLD_BERRY db HEADBUTT, PROTECT, ROAR, LEER dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -1600,7 +1600,7 @@ BattleTowerMons: db BRIGHTPOWDER db MIRROR_MOVE, PURSUIT, PECK, SWIFT dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -1626,7 +1626,7 @@ BattleTowerMons: db MIRACLEBERRY db LOW_KICK, KARATE_CHOP, REVERSAL, FOCUS_ENERGY dw 0 ; OT ID - dt 27000 ; Exp + bigdt 27000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -1655,7 +1655,7 @@ BattleTowerMons: db GOLD_BERRY db RETURN, HYPER_BEAM, EARTHQUAKE, IRON_TAIL dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -1681,7 +1681,7 @@ BattleTowerMons: db LEFTOVERS db SURF, DRAGONBREATH, HYPER_BEAM, BLIZZARD dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -1707,7 +1707,7 @@ BattleTowerMons: db QUICK_CLAW db ATTRACT, BODY_SLAM, PSYCH_UP, EARTHQUAKE dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -1733,7 +1733,7 @@ BattleTowerMons: db LEFTOVERS db THUNDERBOLT, ICE_BEAM, CONFUSE_RAY, SURF dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -1759,7 +1759,7 @@ BattleTowerMons: db GOLD_BERRY db SANDSTORM, IRON_TAIL, EARTHQUAKE, TOXIC dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -1785,7 +1785,7 @@ BattleTowerMons: db KINGS_ROCK db PSYCHIC_M, THUNDERPUNCH, RECOVER, FIRE_PUNCH dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -1811,7 +1811,7 @@ BattleTowerMons: db LEFTOVERS db BLIZZARD, THUNDERBOLT, SURF, PSYCHIC_M dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -1837,7 +1837,7 @@ BattleTowerMons: db GOLD_BERRY db COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -1863,7 +1863,7 @@ BattleTowerMons: db FOCUS_BAND db EXPLOSION, EARTHQUAKE, MEGA_PUNCH, ROCK_SLIDE dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -1889,7 +1889,7 @@ BattleTowerMons: db SCOPE_LENS db SLASH, STEEL_WING, PURSUIT, HYPER_BEAM dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -1915,7 +1915,7 @@ BattleTowerMons: db KINGS_ROCK db EARTHQUAKE, HYPER_BEAM, SLUDGE_BOMB, MUD_SLAP dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -1941,7 +1941,7 @@ BattleTowerMons: db MIRACLEBERRY db SURF, PSYCHIC_M, EARTHQUAKE, BLIZZARD dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -1967,7 +1967,7 @@ BattleTowerMons: db NO_ITEM db CONVERSION2, CONVERSION, PSYBEAM, THIEF dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -1993,7 +1993,7 @@ BattleTowerMons: db CHARCOAL db FLAME_WHEEL, LEER, BODY_SLAM, ROAR dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -2019,7 +2019,7 @@ BattleTowerMons: db LEFTOVERS db RAPID_SPIN, PROTECT, TOXIC, SANDSTORM dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -2045,7 +2045,7 @@ BattleTowerMons: db GOLD_BERRY db CURSE, WATER_GUN, ANCIENTPOWER, ROCK_SMASH dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -2071,7 +2071,7 @@ BattleTowerMons: db KINGS_ROCK db FIRE_SPIN, DRAGON_RAGE, FLY, SLASH dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -2097,7 +2097,7 @@ BattleTowerMons: db BRIGHTPOWDER db EGG_BOMB, STOMP, PSYCH_UP, CONFUSION dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -2123,7 +2123,7 @@ BattleTowerMons: db BRIGHTPOWDER db CONFUSION, THUNDERPUNCH, HEADBUTT, DISABLE dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -2149,7 +2149,7 @@ BattleTowerMons: db QUICK_CLAW db SCREECH, TOXIC, SLUDGE, HARDEN dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -2175,7 +2175,7 @@ BattleTowerMons: db KINGS_ROCK db LIGHT_SCREEN, THUNDERPUNCH, SWIFT, SNORE dw 0 ; OT ID - dt 64000 ; Exp + bigdt 64000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -2204,7 +2204,7 @@ BattleTowerMons: db GOLD_BERRY db SURF, HYPER_BEAM, BLIZZARD, DRAGONBREATH dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 55000 bigdw 55000 @@ -2230,7 +2230,7 @@ BattleTowerMons: db MIRACLEBERRY db REST, CRUNCH, DREAM_EATER, FLAMETHROWER dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 55000 bigdw 50000 @@ -2256,7 +2256,7 @@ BattleTowerMons: db LEFTOVERS db SANDSTORM, REST, TOXIC, WRAP dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 60000 bigdw 60000 @@ -2282,7 +2282,7 @@ BattleTowerMons: db LEFTOVERS db HYPER_BEAM, EARTHQUAKE, SURF, PSYCH_UP dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 60000 bigdw 55000 @@ -2308,7 +2308,7 @@ BattleTowerMons: db GOLD_BERRY db THUNDERBOLT, SURF, CONFUSE_RAY, BLIZZARD dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 55000 bigdw 60000 @@ -2334,7 +2334,7 @@ BattleTowerMons: db KINGS_ROCK db THUNDERBOLT, THUNDER_WAVE, SHADOW_BALL, HIDDEN_POWER dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 55000 bigdw 60000 @@ -2360,7 +2360,7 @@ BattleTowerMons: db LEFTOVERS db HYPER_BEAM, SLASH, AGILITY, METAL_CLAW dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -2386,7 +2386,7 @@ BattleTowerMons: db MINT_BERRY db REST, SURF, PSYCHIC_M, AMNESIA dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 50000 bigdw 40000 @@ -2412,7 +2412,7 @@ BattleTowerMons: db GOLD_BERRY db CROSS_CHOP, EARTHQUAKE, FIRE_BLAST, THUNDERPUNCH dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 40000 bigdw 45000 @@ -2438,7 +2438,7 @@ BattleTowerMons: db SCOPE_LENS db THUNDER_WAVE, RECOVER, THUNDERBOLT, SURF dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 45000 bigdw 44000 @@ -2464,7 +2464,7 @@ BattleTowerMons: db KINGS_ROCK db EARTHQUAKE, SLASH, HYPER_BEAM, SLUDGE_BOMB dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 45000 bigdw 40000 @@ -2490,7 +2490,7 @@ BattleTowerMons: db MIRACLEBERRY db THUNDERBOLT, EXPLOSION, MIRROR_COAT, REST dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -2516,7 +2516,7 @@ BattleTowerMons: db KINGS_ROCK db HYPER_BEAM, EARTHQUAKE, FIRE_BLAST, IRON_TAIL dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -2542,7 +2542,7 @@ BattleTowerMons: db LEFTOVERS db CONFUSE_RAY, ATTRACT, HYPER_BEAM, TOXIC dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 45000 bigdw 40000 @@ -2568,7 +2568,7 @@ BattleTowerMons: db MIRACLEBERRY db DRILL_PECK, THUNDERBOLT, THUNDER_WAVE, HYPER_BEAM dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -2594,7 +2594,7 @@ BattleTowerMons: db GOLD_BERRY db SANDSTORM, FLY, STEEL_WING, TOXIC dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -2620,7 +2620,7 @@ BattleTowerMons: db LEFTOVERS db SANDSTORM, TOXIC, EXPLOSION, SWAGGER dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -2646,7 +2646,7 @@ BattleTowerMons: db MIRACLEBERRY db SANDSTORM, IRON_TAIL, REST, EARTHQUAKE dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -2672,7 +2672,7 @@ BattleTowerMons: db SCOPE_LENS db DREAM_EATER, CRUNCH, PSYCHIC_M, EARTHQUAKE dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 40000 bigdw 40000 @@ -2698,7 +2698,7 @@ BattleTowerMons: db MIRACLEBERRY db HYPER_BEAM, SURF, RAIN_DANCE, ZAP_CANNON dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 40000 bigdw 40000 @@ -2724,7 +2724,7 @@ BattleTowerMons: db GOLD_BERRY db BLIZZARD, HYPER_BEAM, ROAR, ICY_WIND dw 0 ; OT ID - dt 125000 ; Exp + bigdt 125000 ; Exp ; Stat exp bigdw 40000 bigdw 40000 @@ -2753,7 +2753,7 @@ BattleTowerMons: db LEFTOVERS db DRAGONBREATH, SURF, HYPER_BEAM, BLIZZARD dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 55000 bigdw 55000 @@ -2779,7 +2779,7 @@ BattleTowerMons: db GOLD_BERRY db CRUNCH, EARTHQUAKE, ROCK_SLIDE, HYPER_BEAM dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 55000 bigdw 60000 @@ -2805,7 +2805,7 @@ BattleTowerMons: db MIRACLEBERRY db FLAMETHROWER, CRUNCH, DREAM_EATER, REST dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 60000 bigdw 55000 @@ -2831,7 +2831,7 @@ BattleTowerMons: db LEFTOVERS db BLIZZARD, RECOVER, TOXIC, PSYCHIC_M dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 55000 bigdw 50000 @@ -2857,7 +2857,7 @@ BattleTowerMons: db QUICK_CLAW db FIRE_PUNCH, CROSS_CHOP, THUNDERPUNCH, EARTHQUAKE dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -2883,7 +2883,7 @@ BattleTowerMons: db MINT_BERRY db REST, DRILL_PECK, THUNDERBOLT, THUNDER_WAVE dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -2909,7 +2909,7 @@ BattleTowerMons: db GOLD_BERRY db COUNTER, MIRROR_COAT, DESTINY_BOND, SAFEGUARD dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -2935,7 +2935,7 @@ BattleTowerMons: db LEFTOVERS db HYPER_BEAM, SUPERSONIC, EARTHQUAKE, BITE dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -2961,7 +2961,7 @@ BattleTowerMons: db MIRACLEBERRY db HYPER_BEAM, ICY_WIND, THUNDERBOLT, SURF dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -2987,7 +2987,7 @@ BattleTowerMons: db GOLD_BERRY db MUD_SLAP, MOONLIGHT, PSYCHIC_M, FAINT_ATTACK dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -3013,7 +3013,7 @@ BattleTowerMons: db CHARCOAL db FLAMETHROWER, CRUNCH, EXTREMESPEED, IRON_TAIL dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 55000 bigdw 50000 @@ -3039,7 +3039,7 @@ BattleTowerMons: db MIRACLEBERRY db STEEL_WING, FLY, TOXIC, PROTECT dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -3065,7 +3065,7 @@ BattleTowerMons: db LEFTOVERS db SOFTBOILED, TOXIC, PROTECT, PSYCHIC_M dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -3091,7 +3091,7 @@ BattleTowerMons: db PINK_BOW db ROCK_SLIDE, SURF, BODY_SLAM, EARTHQUAKE dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -3117,7 +3117,7 @@ BattleTowerMons: db FOCUS_BAND db REVERSAL, MEGAHORN, EARTHQUAKE, COUNTER dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 50000 bigdw 40000 @@ -3143,7 +3143,7 @@ BattleTowerMons: db MIRACLEBERRY db BLIZZARD, PSYCHIC_M, SHADOW_BALL, ICY_WIND dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -3169,7 +3169,7 @@ BattleTowerMons: db GOLD_BERRY db SURF, EARTHQUAKE, RAPID_SPIN, BLIZZARD dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -3195,7 +3195,7 @@ BattleTowerMons: db QUICK_CLAW db EARTHQUAKE, SURF, IRON_TAIL, ROCK_SLIDE dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -3221,7 +3221,7 @@ BattleTowerMons: db SCOPE_LENS db EARTHQUAKE, SLASH, HYPER_BEAM, SNORE dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -3247,7 +3247,7 @@ BattleTowerMons: db GOLD_BERRY db SPORE, GIGA_DRAIN, HYPER_BEAM, SLUDGE_BOMB dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -3273,7 +3273,7 @@ BattleTowerMons: db BRIGHTPOWDER db EXPLOSION, EARTHQUAKE, FIRE_PUNCH, FRUSTRATION dw 0 ; OT ID - dt 216000 ; Exp + bigdt 216000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -3302,7 +3302,7 @@ BattleTowerMons: db MIRACLEBERRY db THUNDERBOLT, HYPER_BEAM, SHADOW_BALL, ROAR dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 60000 bigdw 56000 @@ -3328,7 +3328,7 @@ BattleTowerMons: db LEFTOVERS db BLIZZARD, SHADOW_BALL, SURF, MUD_SLAP dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -3354,7 +3354,7 @@ BattleTowerMons: db GOLD_BERRY db FAINT_ATTACK, MOONLIGHT, PSYCH_UP, TOXIC dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 54000 bigdw 60000 @@ -3380,7 +3380,7 @@ BattleTowerMons: db GOLD_BERRY db COUNTER, SOFTBOILED, SHADOW_BALL, THUNDERBOLT dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 55000 bigdw 55000 @@ -3406,7 +3406,7 @@ BattleTowerMons: db LEFTOVERS db ROCK_SLIDE, EARTHQUAKE, BLIZZARD, SHADOW_BALL dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 55000 bigdw 55000 @@ -3432,7 +3432,7 @@ BattleTowerMons: db KINGS_ROCK db CRUNCH, FLAMETHROWER, FAINT_ATTACK, ROAR dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 58000 bigdw 50000 @@ -3458,7 +3458,7 @@ BattleTowerMons: db LEFTOVERS db EARTHQUAKE, CRUNCH, ROCK_SLIDE, HYPER_BEAM dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -3484,7 +3484,7 @@ BattleTowerMons: db GOLD_BERRY db THUNDERBOLT, DRILL_PECK, THUNDER_WAVE, HYPER_BEAM dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -3510,7 +3510,7 @@ BattleTowerMons: db MIRACLEBERRY db REST, EXPLOSION, PSYCHIC_M, GIGA_DRAIN dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -3536,7 +3536,7 @@ BattleTowerMons: db GOLD_BERRY db MOONLIGHT, FAINT_ATTACK, PSYCHIC_M, SHADOW_BALL dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -3562,7 +3562,7 @@ BattleTowerMons: db BRIGHTPOWDER db SURF, THUNDERBOLT, HYPER_BEAM, ROAR dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 55000 bigdw 45000 @@ -3588,7 +3588,7 @@ BattleTowerMons: db MIRACLEBERRY db EARTHQUAKE, SURF, SLUDGE_BOMB, IRON_TAIL dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -3614,7 +3614,7 @@ BattleTowerMons: db SCOPE_LENS db SLASH, EARTHQUAKE, HYPER_BEAM, THUNDERPUNCH dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -3640,7 +3640,7 @@ BattleTowerMons: db KINGS_ROCK db REFLECT, FIRE_PUNCH, PSYCHIC_M, ENCORE dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -3666,7 +3666,7 @@ BattleTowerMons: db QUICK_CLAW db CROSS_CHOP, ICE_PUNCH, THUNDERPUNCH, ROCK_SLIDE dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 50000 bigdw 40000 @@ -3692,7 +3692,7 @@ BattleTowerMons: db GOLD_BERRY db AGILITY, BATON_PASS, CRUNCH, EARTHQUAKE dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -3718,7 +3718,7 @@ BattleTowerMons: db FOCUS_BAND db REVERSAL, ENDURE, BODY_SLAM, MEGA_KICK dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -3744,7 +3744,7 @@ BattleTowerMons: db BRIGHTPOWDER db REVERSAL, ENDURE, MEGAHORN, EARTHQUAKE dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -3770,7 +3770,7 @@ BattleTowerMons: db BRIGHTPOWDER db SUNNY_DAY, SOLARBEAM, SYNTHESIS, HYPER_BEAM dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -3796,7 +3796,7 @@ BattleTowerMons: db SCOPE_LENS db SLASH, EARTHQUAKE, HYPER_BEAM, FLAMETHROWER dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -3822,7 +3822,7 @@ BattleTowerMons: db QUICK_CLAW db HYDRO_PUMP, ICE_PUNCH, HYPER_BEAM, IRON_TAIL dw 0 ; OT ID - dt 343000 ; Exp + bigdt 343000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -3851,7 +3851,7 @@ BattleTowerMons: db MIRACLEBERRY db THUNDER_WAVE, THUNDERBOLT, IRON_TAIL, ROAR dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 60000 bigdw 55000 @@ -3877,7 +3877,7 @@ BattleTowerMons: db LEFTOVERS db REST, BELLY_DRUM, SNORE, EARTHQUAKE dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 60000 bigdw 55000 @@ -3903,7 +3903,7 @@ BattleTowerMons: db MINT_BERRY db REST, CRUNCH, FLAMETHROWER, SUNNY_DAY dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 55000 bigdw 50000 @@ -3929,7 +3929,7 @@ BattleTowerMons: db GOLD_BERRY db EARTHQUAKE, BODY_SLAM, IRON_TAIL, HYPER_BEAM dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -3955,7 +3955,7 @@ BattleTowerMons: db MINT_BERRY db REST, SURF, CONFUSE_RAY, PSYCHIC_M dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -3981,7 +3981,7 @@ BattleTowerMons: db MIRACLEBERRY db REST, CRUNCH, EARTHQUAKE, ROCK_SLIDE dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 50000 bigdw 55000 @@ -4007,7 +4007,7 @@ BattleTowerMons: db NO_ITEM db THUNDERBOLT, SHADOW_BALL, CONFUSE_RAY, THIEF dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -4033,7 +4033,7 @@ BattleTowerMons: db LEFTOVERS db EXPLOSION, TOXIC, SOLARBEAM, SWAGGER dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -4059,7 +4059,7 @@ BattleTowerMons: db MINT_BERRY db REST, SURF, BLIZZARD, DRAGONBREATH dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -4085,7 +4085,7 @@ BattleTowerMons: db GOLD_BERRY db THUNDER_WAVE, SURF, THUNDERBOLT, OUTRAGE dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -4111,7 +4111,7 @@ BattleTowerMons: db LEFTOVERS db PSYCHIC_M, RECOVER, HYPER_BEAM, TRI_ATTACK dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 55000 bigdw 50000 @@ -4137,7 +4137,7 @@ BattleTowerMons: db QUICK_CLAW db LOVELY_KISS, BLIZZARD, DREAM_EATER, PSYCHIC_M dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 55000 bigdw 50000 @@ -4163,7 +4163,7 @@ BattleTowerMons: db GOLD_BERRY db SURF, CONFUSE_RAY, BLIZZARD, WING_ATTACK dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 40000 bigdw 45000 @@ -4189,7 +4189,7 @@ BattleTowerMons: db QUICK_CLAW db STEEL_WING, FLY, MUD_SLAP, TOXIC dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -4215,7 +4215,7 @@ BattleTowerMons: db CHARCOAL db FLAMETHROWER, SKY_ATTACK, STEEL_WING, HYPER_BEAM dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 50000 bigdw 40000 @@ -4241,7 +4241,7 @@ BattleTowerMons: db MIRACLEBERRY db HYPER_BEAM, REST, EARTHQUAKE, ROAR dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 50000 bigdw 40000 @@ -4267,7 +4267,7 @@ BattleTowerMons: db KINGS_ROCK db THUNDERBOLT, EXPLOSION, MIRROR_COAT, TOXIC dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -4293,7 +4293,7 @@ BattleTowerMons: db SCOPE_LENS db SLASH, EARTHQUAKE, THIEF, MUD_SLAP dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -4319,7 +4319,7 @@ BattleTowerMons: db QUICK_CLAW db GIGA_DRAIN, SLUDGE_BOMB, HYPER_BEAM, TOXIC dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -4345,7 +4345,7 @@ BattleTowerMons: db GOLD_BERRY db HYPER_BEAM, SUBMISSION, STRENGTH, TOXIC dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -4371,7 +4371,7 @@ BattleTowerMons: db BRIGHTPOWDER db ROAR, SHADOW_BALL, HYPER_BEAM, THUNDERPUNCH dw 0 ; OT ID - dt 512000 ; Exp + bigdt 512000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -4400,7 +4400,7 @@ BattleTowerMons: db KINGS_ROCK db FAINT_ATTACK, MUD_SLAP, MOONLIGHT, CONFUSE_RAY dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 60000 bigdw 60000 @@ -4426,7 +4426,7 @@ BattleTowerMons: db QUICK_CLAW db FIRE_BLAST, HYPER_BEAM, OUTRAGE, BLIZZARD dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 65000 bigdw 50000 @@ -4452,7 +4452,7 @@ BattleTowerMons: db LEFTOVERS db RECOVER, THUNDERBOLT, SURF, PSYCHIC_M dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 60000 bigdw 60000 @@ -4478,7 +4478,7 @@ BattleTowerMons: db LEFTOVERS db EXPLOSION, BLIZZARD, SURF, ICY_WIND dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -4504,7 +4504,7 @@ BattleTowerMons: db GOLD_BERRY db WING_ATTACK, HAZE, HYPER_BEAM, GIGA_DRAIN dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -4530,7 +4530,7 @@ BattleTowerMons: db QUICK_CLAW db TOXIC, PSYCHIC_M, RECOVER, PROTECT dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -4556,7 +4556,7 @@ BattleTowerMons: db LEFTOVERS db DRAGONBREATH, SURF, HYPER_BEAM, BLIZZARD dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -4582,7 +4582,7 @@ BattleTowerMons: db QUICK_CLAW db HYPER_BEAM, CRUNCH, EARTHQUAKE, ROCK_SLIDE dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 50000 bigdw 55000 @@ -4608,7 +4608,7 @@ BattleTowerMons: db MINT_BERRY db REST, SURF, THUNDERBOLT, PSYCHIC_M dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -4634,7 +4634,7 @@ BattleTowerMons: db GOLD_BERRY db PSYCHIC_M, SHADOW_BALL, SUNNY_DAY, MORNING_SUN dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 55000 bigdw 50000 @@ -4660,7 +4660,7 @@ BattleTowerMons: db QUICK_CLAW db CROSS_CHOP, VITAL_THROW, FIRE_BLAST, EARTHQUAKE dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 55000 bigdw 55000 @@ -4686,7 +4686,7 @@ BattleTowerMons: db MIRACLEBERRY db FIRE_BLAST, SURF, EARTHQUAKE, HYPER_BEAM dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -4712,7 +4712,7 @@ BattleTowerMons: db MINT_BERRY db SUNNY_DAY, FLAMETHROWER, EXTREMESPEED, REST dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -4738,7 +4738,7 @@ BattleTowerMons: db LEFTOVERS db SOLARBEAM, SUNNY_DAY, SOFTBOILED, FIRE_BLAST dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 50000 bigdw 45000 @@ -4764,7 +4764,7 @@ BattleTowerMons: db BRIGHTPOWDER db FLAMETHROWER, CRUNCH, SUNNY_DAY, SOLARBEAM dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 50000 bigdw 40000 @@ -4790,7 +4790,7 @@ BattleTowerMons: db QUICK_CLAW db SANDSTORM, STEEL_WING, TOXIC, RETURN dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -4816,7 +4816,7 @@ BattleTowerMons: db LEFTOVERS db TOXIC, WRAP, PROTECT, ENCORE dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -4842,7 +4842,7 @@ BattleTowerMons: db MINT_BERRY db HYPER_BEAM, FLAMETHROWER, SHADOW_BALL, ROAR dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -4868,7 +4868,7 @@ BattleTowerMons: db LEFTOVERS db MILK_DRINK, EARTHQUAKE, ATTRACT, BODY_SLAM dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -4894,7 +4894,7 @@ BattleTowerMons: db PINK_BOW db THUNDERBOLT, HYPER_BEAM, ATTRACT, EARTHQUAKE dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -4920,7 +4920,7 @@ BattleTowerMons: db QUICK_CLAW db TOXIC, SLUDGE_BOMB, ATTRACT, GIGA_DRAIN dw 0 ; OT ID - dt 729000 ; Exp + bigdt 729000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -4949,7 +4949,7 @@ BattleTowerMons: db MINT_BERRY db CRUNCH, FLAMETHROWER, ROAR, REST dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 60000 bigdw 60000 @@ -4975,7 +4975,7 @@ BattleTowerMons: db QUICK_CLAW db CROSS_CHOP, EARTHQUAKE, HYPER_BEAM, VITAL_THROW dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 60000 bigdw 60000 @@ -5001,7 +5001,7 @@ BattleTowerMons: db LEFTOVERS db SURF, DRAGONBREATH, REST, TOXIC dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 60000 bigdw 60000 @@ -5027,7 +5027,7 @@ BattleTowerMons: db BRIGHTPOWDER db THUNDERBOLT, ROAR, THUNDER_WAVE, IRON_TAIL dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -5053,7 +5053,7 @@ BattleTowerMons: db KINGS_ROCK db HYPER_BEAM, EARTHQUAKE, IRON_TAIL, THUNDERBOLT dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -5079,7 +5079,7 @@ BattleTowerMons: db LEFTOVERS db FLAMETHROWER, EXTREMESPEED, IRON_TAIL, HYPER_BEAM dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 55000 bigdw 50000 @@ -5105,7 +5105,7 @@ BattleTowerMons: db SCOPE_LENS db FLAMETHROWER, EARTHQUAKE, SLASH, FLY dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -5131,7 +5131,7 @@ BattleTowerMons: db BRIGHTPOWDER db THUNDER_WAVE, THUNDERBOLT, EXPLOSION, MIRROR_COAT dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -5157,7 +5157,7 @@ BattleTowerMons: db MIRACLEBERRY db SURF, EARTHQUAKE, HYPER_BEAM, ROCK_SLIDE dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 55000 bigdw 50000 @@ -5183,7 +5183,7 @@ BattleTowerMons: db LEFTOVERS db EARTHQUAKE, HYPER_BEAM, SWAGGER, CRUNCH dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -5209,7 +5209,7 @@ BattleTowerMons: db KINGS_ROCK db DRILL_PECK, STEEL_WING, HYPER_BEAM, MUD_SLAP dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 55000 bigdw 50000 @@ -5235,7 +5235,7 @@ BattleTowerMons: db FOCUS_BAND db PERISH_SONG, MEAN_LOOK, PAIN_SPLIT, SHADOW_BALL dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 45000 bigdw 50000 @@ -5261,7 +5261,7 @@ BattleTowerMons: db SCOPE_LENS db SLASH, BLIZZARD, DREAM_EATER, FAINT_ATTACK dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -5287,7 +5287,7 @@ BattleTowerMons: db QUICK_CLAW db STEEL_WING, HYPER_BEAM, SLASH, TOXIC dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -5313,7 +5313,7 @@ BattleTowerMons: db LEFTOVERS db THUNDERBOLT, BLIZZARD, FIRE_BLAST, SOFTBOILED dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 50000 bigdw 40000 @@ -5339,7 +5339,7 @@ BattleTowerMons: db MINT_BERRY db REST, BLIZZARD, HYPER_BEAM, EARTHQUAKE dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -5365,7 +5365,7 @@ BattleTowerMons: db QUICK_CLAW db PSYCHIC_M, TOXIC, EXPLOSION, GIGA_DRAIN dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -5391,7 +5391,7 @@ BattleTowerMons: db LEFTOVERS db SURF, ANCIENTPOWER, BLIZZARD, TOXIC dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 50000 bigdw 50000 @@ -5417,7 +5417,7 @@ BattleTowerMons: db BRIGHTPOWDER db EXPLOSION, EARTHQUAKE, ROCK_SLIDE, FIRE_BLAST dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -5443,7 +5443,7 @@ BattleTowerMons: db FOCUS_BAND db COUNTER, FIRE_PUNCH, THUNDERPUNCH, ICE_PUNCH dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 @@ -5469,7 +5469,7 @@ BattleTowerMons: db QUICK_CLAW db SURF, RAIN_DANCE, ZAP_CANNON, CONFUSE_RAY dw 0 ; OT ID - dt 1000000 ; Exp + bigdt 1000000 ; Exp ; Stat exp bigdw 30000 bigdw 30000 diff --git a/data/events/odd_eggs.asm b/data/events/odd_eggs.asm index c79d29666a2..189ebc8c3f1 100644 --- a/data/events/odd_eggs.asm +++ b/data/events/odd_eggs.asm @@ -40,7 +40,7 @@ OddEggs: db NO_ITEM db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0 dw 02048 ; OT ID - dt 125 ; Exp + bigdt 125 ; Exp ; Stat exp bigdw 0 bigdw 0 @@ -66,7 +66,7 @@ OddEggs: db NO_ITEM db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0 dw 00256 ; OT ID - dt 125 ; Exp + bigdt 125 ; Exp ; Stat exp bigdw 0 bigdw 0 @@ -92,7 +92,7 @@ OddEggs: db NO_ITEM db POUND, CHARM, DIZZY_PUNCH, 0 dw 04096 ; OT ID - dt 125 ; Exp + bigdt 125 ; Exp ; Stat exp bigdw 0 bigdw 0 @@ -118,7 +118,7 @@ OddEggs: db NO_ITEM db POUND, CHARM, DIZZY_PUNCH, 0 dw 00768 ; OT ID - dt 125 ; Exp + bigdt 125 ; Exp ; Stat exp bigdw 0 bigdw 0 @@ -144,7 +144,7 @@ OddEggs: db NO_ITEM db SING, CHARM, DIZZY_PUNCH, 0 dw 04096 ; OT ID - dt 125 ; Exp + bigdt 125 ; Exp ; Stat exp bigdw 0 bigdw 0 @@ -170,7 +170,7 @@ OddEggs: db NO_ITEM db SING, CHARM, DIZZY_PUNCH, 0 dw 00768 ; OT ID - dt 125 ; Exp + bigdt 125 ; Exp ; Stat exp bigdw 0 bigdw 0 @@ -196,7 +196,7 @@ OddEggs: db NO_ITEM db POUND, LICK, DIZZY_PUNCH, 0 dw 03584 ; OT ID - dt 125 ; Exp + bigdt 125 ; Exp ; Stat exp bigdw 0 bigdw 0 @@ -222,7 +222,7 @@ OddEggs: db NO_ITEM db POUND, LICK, DIZZY_PUNCH, 0 dw 00512 ; OT ID - dt 125 ; Exp + bigdt 125 ; Exp ; Stat exp bigdw 0 bigdw 0 @@ -248,7 +248,7 @@ OddEggs: db NO_ITEM db EMBER, DIZZY_PUNCH, 0, 0 dw 02560 ; OT ID - dt 125 ; Exp + bigdt 125 ; Exp ; Stat exp bigdw 0 bigdw 0 @@ -274,7 +274,7 @@ OddEggs: db NO_ITEM db EMBER, DIZZY_PUNCH, 0, 0 dw 00512 ; OT ID - dt 125 ; Exp + bigdt 125 ; Exp ; Stat exp bigdw 0 bigdw 0 @@ -300,7 +300,7 @@ OddEggs: db NO_ITEM db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0 dw 03072 ; OT ID - dt 125 ; Exp + bigdt 125 ; Exp ; Stat exp bigdw 0 bigdw 0 @@ -326,7 +326,7 @@ OddEggs: db NO_ITEM db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0 dw 00512 ; OT ID - dt 125 ; Exp + bigdt 125 ; Exp ; Stat exp bigdw 0 bigdw 0 @@ -352,7 +352,7 @@ OddEggs: db NO_ITEM db TACKLE, DIZZY_PUNCH, 0, 0 dw 02560 ; OT ID - dt 125 ; Exp + bigdt 125 ; Exp ; Stat exp bigdw 0 bigdw 0 @@ -378,7 +378,7 @@ OddEggs: db NO_ITEM db TACKLE, DIZZY_PUNCH, 0, 0 dw 00256 ; OT ID - dt 125 ; Exp + bigdt 125 ; Exp ; Stat exp bigdw 0 bigdw 0 diff --git a/data/items/mom_phone.asm b/data/items/mom_phone.asm index 6e891ef0277..56a56ceb136 100644 --- a/data/items/mom_phone.asm +++ b/data/items/mom_phone.asm @@ -1,7 +1,6 @@ MACRO momitem ; money to trigger, cost, kind, item - dt \1 - dt \2 + bigdt \1, \2 db \3, \4 ENDM @@ -26,4 +25,4 @@ MomItems_2: momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL .End - dt 0 ; unused + bigdt 0 ; unused diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 2ad2d4cf27c..170c94593ff 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -597,7 +597,7 @@ ENDM map_attributes FuchsiaMart, FUCHSIA_MART, $00, 0 map_attributes SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $00, 0 map_attributes FuchsiaGym, FUCHSIA_GYM, $00, 0 - map_attributes BillsBrothersHouse, BILLS_BROTHERS_HOUSE, $00, 0 + map_attributes BillsOlderSistersHouse, BILLS_OLDER_SISTERS_HOUSE, $00, 0 map_attributes FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $00, 0 map_attributes FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $00, 0 map_attributes SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 949ea1e58c4..90153d2ff19 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -138,7 +138,7 @@ VermilionDiglettsCaveSpeechHouse_Blocks: BluesHouse_Blocks: PewterNidoranSpeechHouse_Blocks: PewterSnoozeSpeechHouse_Blocks: -BillsBrothersHouse_Blocks: +BillsOlderSistersHouse_Blocks: LavenderSpeechHouse_Blocks: LavenderNameRater_Blocks: Route12SuperRodHouse_Blocks: diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 41b35973300..6f731608e06 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -376,7 +376,7 @@ MapGroup_Fuchsia: map FuchsiaMart, TILESET_MART, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map FuchsiaGym, TILESET_LAB, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map BillsBrothersHouse, TILESET_HOUSE, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map BillsOlderSistersHouse, TILESET_HOUSE, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map SafariZoneWardensHome, TILESET_HOUSE, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index c80d3cee53f..3c92d325295 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -361,7 +361,7 @@ INCLUDE "maps/MoveDeletersHouse.asm" INCLUDE "maps/FuchsiaMart.asm" INCLUDE "maps/SafariZoneMainOffice.asm" INCLUDE "maps/FuchsiaGym.asm" -INCLUDE "maps/BillsBrothersHouse.asm" +INCLUDE "maps/BillsOlderSistersHouse.asm" INCLUDE "maps/FuchsiaPokecenter1F.asm" INCLUDE "maps/FuchsiaPokecenter2FBeta.asm" INCLUDE "maps/SafariZoneWardensHome.asm" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 5cefbd38ea5..ca38dee1d0e 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -1,11 +1,11 @@ PokemonPalettes: ; entries correspond to Pokémon species, two apiece -; Each front.gbcpal is generated from the corresponding .png, and +; Each normal.gbcpal is generated from the corresponding .png, and ; only the middle two colors are included, not black or white. ; Shiny palettes are defined directly, not generated. - ; 2 middle palettes, front and shiny, with 2 colors each + ; 2 middle palettes, normal and shiny, with 2 colors each table_width PAL_COLOR_SIZE * 2 * 2, PokemonPalettes ; 000 @@ -15,507 +15,507 @@ PokemonPalettes: RGB 30, 22, 17 RGB 16, 14, 19 -INCBIN "gfx/pokemon/bulbasaur/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/bulbasaur/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/bulbasaur/shiny.pal" -INCBIN "gfx/pokemon/ivysaur/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/ivysaur/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/ivysaur/shiny.pal" -INCBIN "gfx/pokemon/venusaur/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/venusaur/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/venusaur/shiny.pal" -INCBIN "gfx/pokemon/charmander/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/charmander/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/charmander/shiny.pal" -INCBIN "gfx/pokemon/charmeleon/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/charmeleon/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/charmeleon/shiny.pal" -INCBIN "gfx/pokemon/charizard/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/charizard/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/charizard/shiny.pal" -INCBIN "gfx/pokemon/squirtle/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/squirtle/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/squirtle/shiny.pal" -INCBIN "gfx/pokemon/wartortle/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/wartortle/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/wartortle/shiny.pal" -INCBIN "gfx/pokemon/blastoise/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/blastoise/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/blastoise/shiny.pal" -INCBIN "gfx/pokemon/caterpie/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/caterpie/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/caterpie/shiny.pal" -INCBIN "gfx/pokemon/metapod/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/metapod/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/metapod/shiny.pal" -INCBIN "gfx/pokemon/butterfree/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/butterfree/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/butterfree/shiny.pal" -INCBIN "gfx/pokemon/weedle/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/weedle/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/weedle/shiny.pal" -INCBIN "gfx/pokemon/kakuna/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/kakuna/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/kakuna/shiny.pal" -INCBIN "gfx/pokemon/beedrill/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/beedrill/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/beedrill/shiny.pal" -INCBIN "gfx/pokemon/pidgey/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/pidgey/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/pidgey/shiny.pal" -INCBIN "gfx/pokemon/pidgeotto/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/pidgeotto/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/pidgeotto/shiny.pal" -INCBIN "gfx/pokemon/pidgeot/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/pidgeot/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/pidgeot/shiny.pal" -INCBIN "gfx/pokemon/rattata/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/rattata/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/rattata/shiny.pal" -INCBIN "gfx/pokemon/raticate/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/raticate/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/raticate/shiny.pal" -INCBIN "gfx/pokemon/spearow/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/spearow/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/spearow/shiny.pal" -INCBIN "gfx/pokemon/fearow/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/fearow/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/fearow/shiny.pal" -INCBIN "gfx/pokemon/ekans/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/ekans/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/ekans/shiny.pal" -INCBIN "gfx/pokemon/arbok/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/arbok/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/arbok/shiny.pal" -INCBIN "gfx/pokemon/pikachu/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/pikachu/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/pikachu/shiny.pal" -INCBIN "gfx/pokemon/raichu/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/raichu/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/raichu/shiny.pal" -INCBIN "gfx/pokemon/sandshrew/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/sandshrew/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/sandshrew/shiny.pal" -INCBIN "gfx/pokemon/sandslash/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/sandslash/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/sandslash/shiny.pal" -INCBIN "gfx/pokemon/nidoran_f/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/nidoran_f/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/nidoran_f/shiny.pal" -INCBIN "gfx/pokemon/nidorina/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/nidorina/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/nidorina/shiny.pal" -INCBIN "gfx/pokemon/nidoqueen/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/nidoqueen/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/nidoqueen/shiny.pal" -INCBIN "gfx/pokemon/nidoran_m/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/nidoran_m/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/nidoran_m/shiny.pal" -INCBIN "gfx/pokemon/nidorino/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/nidorino/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/nidorino/shiny.pal" -INCBIN "gfx/pokemon/nidoking/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/nidoking/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/nidoking/shiny.pal" -INCBIN "gfx/pokemon/clefairy/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/clefairy/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/clefairy/shiny.pal" -INCBIN "gfx/pokemon/clefable/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/clefable/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/clefable/shiny.pal" -INCBIN "gfx/pokemon/vulpix/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/vulpix/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/vulpix/shiny.pal" -INCBIN "gfx/pokemon/ninetales/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/ninetales/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/ninetales/shiny.pal" -INCBIN "gfx/pokemon/jigglypuff/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/jigglypuff/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/jigglypuff/shiny.pal" -INCBIN "gfx/pokemon/wigglytuff/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/wigglytuff/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/wigglytuff/shiny.pal" -INCBIN "gfx/pokemon/zubat/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/zubat/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/zubat/shiny.pal" -INCBIN "gfx/pokemon/golbat/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/golbat/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/golbat/shiny.pal" -INCBIN "gfx/pokemon/oddish/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/oddish/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/oddish/shiny.pal" -INCBIN "gfx/pokemon/gloom/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/gloom/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/gloom/shiny.pal" -INCBIN "gfx/pokemon/vileplume/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/vileplume/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/vileplume/shiny.pal" -INCBIN "gfx/pokemon/paras/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/paras/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/paras/shiny.pal" -INCBIN "gfx/pokemon/parasect/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/parasect/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/parasect/shiny.pal" -INCBIN "gfx/pokemon/venonat/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/venonat/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/venonat/shiny.pal" -INCBIN "gfx/pokemon/venomoth/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/venomoth/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/venomoth/shiny.pal" -INCBIN "gfx/pokemon/diglett/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/diglett/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/diglett/shiny.pal" -INCBIN "gfx/pokemon/dugtrio/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/dugtrio/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/dugtrio/shiny.pal" -INCBIN "gfx/pokemon/meowth/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/meowth/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/meowth/shiny.pal" -INCBIN "gfx/pokemon/persian/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/persian/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/persian/shiny.pal" -INCBIN "gfx/pokemon/psyduck/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/psyduck/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/psyduck/shiny.pal" -INCBIN "gfx/pokemon/golduck/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/golduck/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/golduck/shiny.pal" -INCBIN "gfx/pokemon/mankey/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/mankey/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/mankey/shiny.pal" -INCBIN "gfx/pokemon/primeape/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/primeape/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/primeape/shiny.pal" -INCBIN "gfx/pokemon/growlithe/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/growlithe/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/growlithe/shiny.pal" -INCBIN "gfx/pokemon/arcanine/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/arcanine/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/arcanine/shiny.pal" -INCBIN "gfx/pokemon/poliwag/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/poliwag/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/poliwag/shiny.pal" -INCBIN "gfx/pokemon/poliwhirl/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/poliwhirl/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/poliwhirl/shiny.pal" -INCBIN "gfx/pokemon/poliwrath/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/poliwrath/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/poliwrath/shiny.pal" -INCBIN "gfx/pokemon/abra/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/abra/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/abra/shiny.pal" -INCBIN "gfx/pokemon/kadabra/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/kadabra/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/kadabra/shiny.pal" -INCBIN "gfx/pokemon/alakazam/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/alakazam/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/alakazam/shiny.pal" -INCBIN "gfx/pokemon/machop/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/machop/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/machop/shiny.pal" -INCBIN "gfx/pokemon/machoke/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/machoke/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/machoke/shiny.pal" -INCBIN "gfx/pokemon/machamp/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/machamp/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/machamp/shiny.pal" -INCBIN "gfx/pokemon/bellsprout/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/bellsprout/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/bellsprout/shiny.pal" -INCBIN "gfx/pokemon/weepinbell/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/weepinbell/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/weepinbell/shiny.pal" -INCBIN "gfx/pokemon/victreebel/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/victreebel/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/victreebel/shiny.pal" -INCBIN "gfx/pokemon/tentacool/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/tentacool/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/tentacool/shiny.pal" -INCBIN "gfx/pokemon/tentacruel/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/tentacruel/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/tentacruel/shiny.pal" -INCBIN "gfx/pokemon/geodude/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/geodude/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/geodude/shiny.pal" -INCBIN "gfx/pokemon/graveler/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/graveler/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/graveler/shiny.pal" -INCBIN "gfx/pokemon/golem/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/golem/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/golem/shiny.pal" -INCBIN "gfx/pokemon/ponyta/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/ponyta/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/ponyta/shiny.pal" -INCBIN "gfx/pokemon/rapidash/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/rapidash/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/rapidash/shiny.pal" -INCBIN "gfx/pokemon/slowpoke/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/slowpoke/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/slowpoke/shiny.pal" -INCBIN "gfx/pokemon/slowbro/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/slowbro/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/slowbro/shiny.pal" -INCBIN "gfx/pokemon/magnemite/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/magnemite/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/magnemite/shiny.pal" -INCBIN "gfx/pokemon/magneton/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/magneton/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/magneton/shiny.pal" -INCBIN "gfx/pokemon/farfetch_d/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/farfetch_d/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/farfetch_d/shiny.pal" -INCBIN "gfx/pokemon/doduo/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/doduo/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/doduo/shiny.pal" -INCBIN "gfx/pokemon/dodrio/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/dodrio/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/dodrio/shiny.pal" -INCBIN "gfx/pokemon/seel/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/seel/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/seel/shiny.pal" -INCBIN "gfx/pokemon/dewgong/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/dewgong/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/dewgong/shiny.pal" -INCBIN "gfx/pokemon/grimer/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/grimer/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/grimer/shiny.pal" -INCBIN "gfx/pokemon/muk/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/muk/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/muk/shiny.pal" -INCBIN "gfx/pokemon/shellder/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/shellder/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/shellder/shiny.pal" -INCBIN "gfx/pokemon/cloyster/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/cloyster/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/cloyster/shiny.pal" -INCBIN "gfx/pokemon/gastly/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/gastly/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/gastly/shiny.pal" -INCBIN "gfx/pokemon/haunter/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/haunter/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/haunter/shiny.pal" -INCBIN "gfx/pokemon/gengar/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/gengar/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/gengar/shiny.pal" -INCBIN "gfx/pokemon/onix/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/onix/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/onix/shiny.pal" -INCBIN "gfx/pokemon/drowzee/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/drowzee/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/drowzee/shiny.pal" -INCBIN "gfx/pokemon/hypno/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/hypno/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/hypno/shiny.pal" -INCBIN "gfx/pokemon/krabby/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/krabby/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/krabby/shiny.pal" -INCBIN "gfx/pokemon/kingler/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/kingler/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/kingler/shiny.pal" -INCBIN "gfx/pokemon/voltorb/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/voltorb/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/voltorb/shiny.pal" -INCBIN "gfx/pokemon/electrode/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/electrode/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/electrode/shiny.pal" -INCBIN "gfx/pokemon/exeggcute/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/exeggcute/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/exeggcute/shiny.pal" -INCBIN "gfx/pokemon/exeggutor/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/exeggutor/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/exeggutor/shiny.pal" -INCBIN "gfx/pokemon/cubone/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/cubone/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/cubone/shiny.pal" -INCBIN "gfx/pokemon/marowak/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/marowak/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/marowak/shiny.pal" -INCBIN "gfx/pokemon/hitmonlee/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/hitmonlee/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/hitmonlee/shiny.pal" -INCBIN "gfx/pokemon/hitmonchan/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/hitmonchan/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/hitmonchan/shiny.pal" -INCBIN "gfx/pokemon/lickitung/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/lickitung/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/lickitung/shiny.pal" -INCBIN "gfx/pokemon/koffing/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/koffing/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/koffing/shiny.pal" -INCBIN "gfx/pokemon/weezing/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/weezing/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/weezing/shiny.pal" -INCBIN "gfx/pokemon/rhyhorn/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/rhyhorn/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/rhyhorn/shiny.pal" -INCBIN "gfx/pokemon/rhydon/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/rhydon/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/rhydon/shiny.pal" -INCBIN "gfx/pokemon/chansey/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/chansey/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/chansey/shiny.pal" -INCBIN "gfx/pokemon/tangela/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/tangela/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/tangela/shiny.pal" -INCBIN "gfx/pokemon/kangaskhan/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/kangaskhan/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/kangaskhan/shiny.pal" -INCBIN "gfx/pokemon/horsea/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/horsea/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/horsea/shiny.pal" -INCBIN "gfx/pokemon/seadra/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/seadra/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/seadra/shiny.pal" -INCBIN "gfx/pokemon/goldeen/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/goldeen/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/goldeen/shiny.pal" -INCBIN "gfx/pokemon/seaking/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/seaking/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/seaking/shiny.pal" -INCBIN "gfx/pokemon/staryu/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/staryu/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/staryu/shiny.pal" -INCBIN "gfx/pokemon/starmie/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/starmie/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/starmie/shiny.pal" -INCBIN "gfx/pokemon/mr__mime/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/mr__mime/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/mr__mime/shiny.pal" -INCBIN "gfx/pokemon/scyther/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/scyther/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/scyther/shiny.pal" -INCBIN "gfx/pokemon/jynx/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/jynx/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/jynx/shiny.pal" -INCBIN "gfx/pokemon/electabuzz/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/electabuzz/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/electabuzz/shiny.pal" -INCBIN "gfx/pokemon/magmar/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/magmar/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/magmar/shiny.pal" -INCBIN "gfx/pokemon/pinsir/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/pinsir/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/pinsir/shiny.pal" -INCBIN "gfx/pokemon/tauros/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/tauros/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/tauros/shiny.pal" -INCBIN "gfx/pokemon/magikarp/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/magikarp/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/magikarp/shiny.pal" -INCBIN "gfx/pokemon/gyarados/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/gyarados/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/gyarados/shiny.pal" -INCBIN "gfx/pokemon/lapras/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/lapras/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/lapras/shiny.pal" -INCBIN "gfx/pokemon/ditto/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/ditto/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/ditto/shiny.pal" -INCBIN "gfx/pokemon/eevee/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/eevee/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/eevee/shiny.pal" -INCBIN "gfx/pokemon/vaporeon/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/vaporeon/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/vaporeon/shiny.pal" -INCBIN "gfx/pokemon/jolteon/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/jolteon/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/jolteon/shiny.pal" -INCBIN "gfx/pokemon/flareon/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/flareon/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/flareon/shiny.pal" -INCBIN "gfx/pokemon/porygon/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/porygon/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/porygon/shiny.pal" -INCBIN "gfx/pokemon/omanyte/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/omanyte/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/omanyte/shiny.pal" -INCBIN "gfx/pokemon/omastar/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/omastar/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/omastar/shiny.pal" -INCBIN "gfx/pokemon/kabuto/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/kabuto/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/kabuto/shiny.pal" -INCBIN "gfx/pokemon/kabutops/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/kabutops/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/kabutops/shiny.pal" -INCBIN "gfx/pokemon/aerodactyl/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/aerodactyl/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/aerodactyl/shiny.pal" -INCBIN "gfx/pokemon/snorlax/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/snorlax/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/snorlax/shiny.pal" -INCBIN "gfx/pokemon/articuno/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/articuno/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/articuno/shiny.pal" -INCBIN "gfx/pokemon/zapdos/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/zapdos/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/zapdos/shiny.pal" -INCBIN "gfx/pokemon/moltres/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/moltres/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/moltres/shiny.pal" -INCBIN "gfx/pokemon/dratini/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/dratini/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/dratini/shiny.pal" -INCBIN "gfx/pokemon/dragonair/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/dragonair/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/dragonair/shiny.pal" -INCBIN "gfx/pokemon/dragonite/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/dragonite/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/dragonite/shiny.pal" -INCBIN "gfx/pokemon/mewtwo/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/mewtwo/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/mewtwo/shiny.pal" -INCBIN "gfx/pokemon/mew/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/mew/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/mew/shiny.pal" -INCBIN "gfx/pokemon/chikorita/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/chikorita/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/chikorita/shiny.pal" -INCBIN "gfx/pokemon/bayleef/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/bayleef/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/bayleef/shiny.pal" -INCBIN "gfx/pokemon/meganium/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/meganium/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/meganium/shiny.pal" -INCBIN "gfx/pokemon/cyndaquil/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/cyndaquil/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/cyndaquil/shiny.pal" -INCBIN "gfx/pokemon/quilava/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/quilava/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/quilava/shiny.pal" -INCBIN "gfx/pokemon/typhlosion/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/typhlosion/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/typhlosion/shiny.pal" -INCBIN "gfx/pokemon/totodile/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/totodile/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/totodile/shiny.pal" -INCBIN "gfx/pokemon/croconaw/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/croconaw/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/croconaw/shiny.pal" -INCBIN "gfx/pokemon/feraligatr/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/feraligatr/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/feraligatr/shiny.pal" -INCBIN "gfx/pokemon/sentret/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/sentret/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/sentret/shiny.pal" -INCBIN "gfx/pokemon/furret/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/furret/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/furret/shiny.pal" -INCBIN "gfx/pokemon/hoothoot/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/hoothoot/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/hoothoot/shiny.pal" -INCBIN "gfx/pokemon/noctowl/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/noctowl/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/noctowl/shiny.pal" -INCBIN "gfx/pokemon/ledyba/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/ledyba/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/ledyba/shiny.pal" -INCBIN "gfx/pokemon/ledian/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/ledian/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/ledian/shiny.pal" -INCBIN "gfx/pokemon/spinarak/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/spinarak/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/spinarak/shiny.pal" -INCBIN "gfx/pokemon/ariados/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/ariados/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/ariados/shiny.pal" -INCBIN "gfx/pokemon/crobat/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/crobat/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/crobat/shiny.pal" -INCBIN "gfx/pokemon/chinchou/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/chinchou/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/chinchou/shiny.pal" -INCBIN "gfx/pokemon/lanturn/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/lanturn/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/lanturn/shiny.pal" -INCBIN "gfx/pokemon/pichu/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/pichu/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/pichu/shiny.pal" -INCBIN "gfx/pokemon/cleffa/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/cleffa/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/cleffa/shiny.pal" -INCBIN "gfx/pokemon/igglybuff/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/igglybuff/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/igglybuff/shiny.pal" -INCBIN "gfx/pokemon/togepi/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/togepi/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/togepi/shiny.pal" -INCBIN "gfx/pokemon/togetic/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/togetic/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/togetic/shiny.pal" -INCBIN "gfx/pokemon/natu/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/natu/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/natu/shiny.pal" -INCBIN "gfx/pokemon/xatu/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/xatu/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/xatu/shiny.pal" -INCBIN "gfx/pokemon/mareep/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/mareep/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/mareep/shiny.pal" -INCBIN "gfx/pokemon/flaaffy/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/flaaffy/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/flaaffy/shiny.pal" -INCBIN "gfx/pokemon/ampharos/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/ampharos/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/ampharos/shiny.pal" -INCBIN "gfx/pokemon/bellossom/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/bellossom/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/bellossom/shiny.pal" -INCBIN "gfx/pokemon/marill/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/marill/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/marill/shiny.pal" -INCBIN "gfx/pokemon/azumarill/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/azumarill/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/azumarill/shiny.pal" -INCBIN "gfx/pokemon/sudowoodo/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/sudowoodo/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/sudowoodo/shiny.pal" -INCBIN "gfx/pokemon/politoed/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/politoed/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/politoed/shiny.pal" -INCBIN "gfx/pokemon/hoppip/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/hoppip/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/hoppip/shiny.pal" -INCBIN "gfx/pokemon/skiploom/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/skiploom/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/skiploom/shiny.pal" -INCBIN "gfx/pokemon/jumpluff/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/jumpluff/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/jumpluff/shiny.pal" -INCBIN "gfx/pokemon/aipom/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/aipom/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/aipom/shiny.pal" -INCBIN "gfx/pokemon/sunkern/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/sunkern/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/sunkern/shiny.pal" -INCBIN "gfx/pokemon/sunflora/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/sunflora/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/sunflora/shiny.pal" -INCBIN "gfx/pokemon/yanma/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/yanma/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/yanma/shiny.pal" -INCBIN "gfx/pokemon/wooper/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/wooper/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/wooper/shiny.pal" -INCBIN "gfx/pokemon/quagsire/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/quagsire/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/quagsire/shiny.pal" -INCBIN "gfx/pokemon/espeon/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/espeon/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/espeon/shiny.pal" -INCBIN "gfx/pokemon/umbreon/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/umbreon/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/umbreon/shiny.pal" -INCBIN "gfx/pokemon/murkrow/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/murkrow/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/murkrow/shiny.pal" -INCBIN "gfx/pokemon/slowking/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/slowking/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/slowking/shiny.pal" -INCBIN "gfx/pokemon/misdreavus/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/misdreavus/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/misdreavus/shiny.pal" -INCLUDE "gfx/pokemon/unown/normal.pal" ; not front.gbcpal +INCBIN "gfx/pokemon/unown/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/unown/shiny.pal" -INCBIN "gfx/pokemon/wobbuffet/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/wobbuffet/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/wobbuffet/shiny.pal" -INCBIN "gfx/pokemon/girafarig/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/girafarig/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/girafarig/shiny.pal" -INCBIN "gfx/pokemon/pineco/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/pineco/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/pineco/shiny.pal" -INCBIN "gfx/pokemon/forretress/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/forretress/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/forretress/shiny.pal" -INCBIN "gfx/pokemon/dunsparce/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/dunsparce/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/dunsparce/shiny.pal" -INCBIN "gfx/pokemon/gligar/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/gligar/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/gligar/shiny.pal" -INCBIN "gfx/pokemon/steelix/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/steelix/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/steelix/shiny.pal" -INCBIN "gfx/pokemon/snubbull/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/snubbull/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/snubbull/shiny.pal" -INCBIN "gfx/pokemon/granbull/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/granbull/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/granbull/shiny.pal" -INCBIN "gfx/pokemon/qwilfish/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/qwilfish/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/qwilfish/shiny.pal" -INCBIN "gfx/pokemon/scizor/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/scizor/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/scizor/shiny.pal" -INCBIN "gfx/pokemon/shuckle/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/shuckle/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/shuckle/shiny.pal" -INCBIN "gfx/pokemon/heracross/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/heracross/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/heracross/shiny.pal" -INCBIN "gfx/pokemon/sneasel/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/sneasel/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/sneasel/shiny.pal" -INCBIN "gfx/pokemon/teddiursa/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/teddiursa/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/teddiursa/shiny.pal" -INCBIN "gfx/pokemon/ursaring/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/ursaring/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/ursaring/shiny.pal" -INCBIN "gfx/pokemon/slugma/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/slugma/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/slugma/shiny.pal" -INCBIN "gfx/pokemon/magcargo/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/magcargo/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/magcargo/shiny.pal" -INCBIN "gfx/pokemon/swinub/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/swinub/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/swinub/shiny.pal" -INCBIN "gfx/pokemon/piloswine/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/piloswine/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/piloswine/shiny.pal" -INCBIN "gfx/pokemon/corsola/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/corsola/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/corsola/shiny.pal" -INCBIN "gfx/pokemon/remoraid/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/remoraid/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/remoraid/shiny.pal" -INCBIN "gfx/pokemon/octillery/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/octillery/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/octillery/shiny.pal" -INCBIN "gfx/pokemon/delibird/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/delibird/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/delibird/shiny.pal" -INCBIN "gfx/pokemon/mantine/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/mantine/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/mantine/shiny.pal" -INCBIN "gfx/pokemon/skarmory/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/skarmory/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/skarmory/shiny.pal" -INCBIN "gfx/pokemon/houndour/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/houndour/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/houndour/shiny.pal" -INCBIN "gfx/pokemon/houndoom/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/houndoom/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/houndoom/shiny.pal" -INCBIN "gfx/pokemon/kingdra/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/kingdra/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/kingdra/shiny.pal" -INCBIN "gfx/pokemon/phanpy/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/phanpy/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/phanpy/shiny.pal" -INCBIN "gfx/pokemon/donphan/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/donphan/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/donphan/shiny.pal" -INCBIN "gfx/pokemon/porygon2/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/porygon2/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/porygon2/shiny.pal" -INCBIN "gfx/pokemon/stantler/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/stantler/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/stantler/shiny.pal" -INCBIN "gfx/pokemon/smeargle/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/smeargle/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/smeargle/shiny.pal" -INCBIN "gfx/pokemon/tyrogue/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/tyrogue/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/tyrogue/shiny.pal" -INCBIN "gfx/pokemon/hitmontop/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/hitmontop/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/hitmontop/shiny.pal" -INCBIN "gfx/pokemon/smoochum/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/smoochum/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/smoochum/shiny.pal" -INCBIN "gfx/pokemon/elekid/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/elekid/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/elekid/shiny.pal" -INCBIN "gfx/pokemon/magby/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/magby/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/magby/shiny.pal" -INCBIN "gfx/pokemon/miltank/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/miltank/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/miltank/shiny.pal" -INCBIN "gfx/pokemon/blissey/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/blissey/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/blissey/shiny.pal" -INCBIN "gfx/pokemon/raikou/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/raikou/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/raikou/shiny.pal" -INCBIN "gfx/pokemon/entei/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/entei/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/entei/shiny.pal" -INCBIN "gfx/pokemon/suicune/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/suicune/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/suicune/shiny.pal" -INCBIN "gfx/pokemon/larvitar/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/larvitar/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/larvitar/shiny.pal" -INCBIN "gfx/pokemon/pupitar/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/pupitar/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/pupitar/shiny.pal" -INCBIN "gfx/pokemon/tyranitar/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/tyranitar/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/tyranitar/shiny.pal" -INCBIN "gfx/pokemon/lugia/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/lugia/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/lugia/shiny.pal" -INCBIN "gfx/pokemon/ho_oh/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/ho_oh/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/ho_oh/shiny.pal" -INCBIN "gfx/pokemon/celebi/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/celebi/normal.gbcpal", middle_colors INCLUDE "gfx/pokemon/celebi/shiny.pal" assert_table_length NUM_POKEMON + 1 @@ -527,7 +527,7 @@ INCLUDE "gfx/pokemon/celebi/shiny.pal" RGB 30, 26, 11 RGB 23, 16, 00 -INCBIN "gfx/pokemon/egg/front.gbcpal", middle_colors +INCBIN "gfx/pokemon/egg/front.gbcpal", middle_colors ; not normal.gbcpal INCLUDE "gfx/pokemon/egg/shiny.pal" assert_table_length EGG + 1 diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm index b289ce36b77..bb5951d5342 100644 --- a/engine/battle/ai/scoring.asm +++ b/engine/battle/ai/scoring.asm @@ -1592,26 +1592,31 @@ AI_Smart_Curse: cp GHOST jr z, .ghost_curse call AICheckEnemyHalfHP - jr nc, .encourage + jr nc, .discourage ld a, [wEnemyAtkLevel] cp BASE_STAT_LEVEL + 4 - jr nc, .encourage + jr nc, .discourage cp BASE_STAT_LEVEL + 2 ret nc ld a, [wBattleMonType1] cp GHOST - jr z, .greatly_encourage + jr z, .greatly_discourage + cp SPECIAL + ret nc + ld a, [wBattleMonType2] + cp SPECIAL + ret nc call AI_80_20 ret c dec [hl] dec [hl] ret -.approve +.highly_discourage inc [hl] inc [hl] -.greatly_encourage +.greatly_discourage inc [hl] -.encourage +.discourage inc [hl] ret .ghost_curse @@ -1625,7 +1630,7 @@ AI_Smart_Curse: push hl call AICheckLastPlayerMon pop hl - jr nz, .approve + jr nz, .highly_discourage jr .ghost_continue .notlastmon push hl @@ -1634,9 +1639,9 @@ AI_Smart_Curse: jr z, .maybe_greatly_encourage .ghost_continue call AICheckEnemyQuarterHP - jp nc, .approve + jp nc, .highly_discourage call AICheckEnemyHalfHP - jr nc, .greatly_encourage + jr nc, .greatly_discourage call AICheckEnemyMaxHP ret nc ld a, [wPlayerTurnsTaken] @@ -1650,27 +1655,23 @@ AI_Smart_Curse: ret AI_Smart_Protect: -; Greatly discourage this move if the enemy already used Protect. + ; Greatly discourage this move if the enemy already used Protect. ld a, [wEnemyProtectCount] and a jr nz, .greatly_discourage - -; Discourage this move if the player is locked on. + ; Discourage this move if the player is locked on. ld a, [wPlayerSubStatus5] bit SUBSTATUS_LOCK_ON, a jr nz, .discourage - -; Encourage this move if the player's Fury Cutter is boosted enough. + ; Encourage this move if the player's Fury Cutter is boosted enough. ld a, [wPlayerFuryCutterCount] cp 3 jr nc, .encourage - -; Encourage this move if the player has charged a two-turn move. + ; Encourage this move if the player has charged a two-turn move. ld a, [wPlayerSubStatus3] bit SUBSTATUS_CHARGED, a jr nz, .encourage - -; Encourage this move if the player is affected by Toxic, Leech Seed, or Curse. + ; Encourage this move if the player is affected by Toxic, Leech Seed, or Curse. ld a, [wPlayerSubStatus5] bit SUBSTATUS_TOXIC, a jr nz, .encourage @@ -1680,66 +1681,54 @@ AI_Smart_Protect: ld a, [wPlayerSubStatus1] bit SUBSTATUS_CURSE, a jr nz, .encourage - -; Discourage this move if the player's Rollout count is not boosted enough. + ; Discourage this move if the player's Rollout count is not boosted enough. bit SUBSTATUS_ROLLOUT, a jr z, .discourage ld a, [wPlayerRolloutCount] cp 3 jr c, .discourage - -; 80% chance to encourage this move otherwise. .encourage + ; 80% chance to encourage this move otherwise. call AI_80_20 ret c - dec [hl] ret - .greatly_discourage inc [hl] - .discourage call Random cp 8 percent ret c - inc [hl] inc [hl] ret AI_Smart_Foresight: -; 60% chance to encourage this move if the enemy's accuracy is sharply lowered. + ; 60% chance to encourage this move if the enemy's accuracy is sharply lowered. ld a, [wEnemyAccLevel] cp BASE_STAT_LEVEL - 2 jr c, .encourage - -; 60% chance to encourage this move if the player's evasion is sharply raised. + ; 60% chance to encourage this move if the player's evasion is sharply raised. ld a, [wPlayerEvaLevel] cp BASE_STAT_LEVEL + 3 jr nc, .encourage - -; 60% chance to encourage this move if the player is a Ghost type. + ; 60% chance to encourage this move if the player is a Ghost type. ld a, [wBattleMonType1] cp GHOST jr z, .encourage ld a, [wBattleMonType2] cp GHOST jr z, .encourage - -; 92% chance to discourage this move otherwise. + ; 92% chance to discourage this move otherwise. call Random cp 8 percent ret c - inc [hl] ret - .encourage call Random cp 39 percent + 1 ret c - dec [hl] dec [hl] ret @@ -1749,31 +1738,24 @@ AI_Smart_PerishSong: callfar FindAliveEnemyMons pop hl jr c, .no - ld a, [wPlayerSubStatus5] bit SUBSTATUS_CANT_RUN, a jr nz, .yes - push hl callfar CheckPlayerMoveTypeMatchups ld a, [wEnemyAISwitchScore] cp BASE_AI_SWITCH_SCORE pop hl ret c - call AI_50_50 ret c - inc [hl] ret - .yes call AI_50_50 ret c - dec [hl] ret - .no ld a, [hl] add 5 @@ -1781,7 +1763,7 @@ AI_Smart_PerishSong: ret AI_Smart_Sandstorm: -; Greatly discourage this move if the player is immune to Sandstorm damage. + ; Greatly discourage this move if the player is immune to Sandstorm damage. ld a, [wBattleMonType1] push hl ld hl, .SandstormImmuneTypes @@ -1789,7 +1771,6 @@ AI_Smart_Sandstorm: call IsInArray pop hl jr c, .greatly_discourage - ld a, [wBattleMonType2] push hl ld hl, .SandstormImmuneTypes @@ -1797,24 +1778,19 @@ AI_Smart_Sandstorm: call IsInArray pop hl jr c, .greatly_discourage - -; Discourage this move if player's HP is below 50%. + ; Discourage this move if player's HP is below 50%. call AICheckPlayerHalfHP jr nc, .discourage - -; 50% chance to encourage this move otherwise. + ; 50% chance to encourage this move otherwise. call AI_50_50 ret c - dec [hl] ret - .greatly_discourage inc [hl] .discourage inc [hl] ret - .SandstormImmuneTypes: db ROCK db GROUND @@ -1822,47 +1798,38 @@ AI_Smart_Sandstorm: db -1 ; end AI_Smart_Endure: -; Greatly discourage this move if the enemy already used Protect. + ; Greatly discourage this move if the enemy already used Protect. ld a, [wEnemyProtectCount] and a jr nz, .greatly_discourage - -; Greatly discourage this move if the enemy's HP is full. + ; Greatly discourage this move if the enemy's HP is full. call AICheckEnemyMaxHP jr c, .greatly_discourage - -; Discourage this move if the enemy's HP is at least 25%. + ; Discourage this move if the enemy's HP is at least 25%. call AICheckEnemyQuarterHP jr c, .discourage - -; If the enemy has Reversal... + ; If the enemy has Reversal... ld b, EFFECT_REVERSAL call AIHasMoveEffect jr nc, .no_reversal - -; ...80% chance to greatly encourage this move. + ; ...80% chance to greatly encourage this move. call AI_80_20 ret c - dec [hl] dec [hl] dec [hl] ret - .no_reversal -; If the enemy is not locked on, do nothing. + ; If the enemy is not locked on, do nothing. ld a, [wEnemySubStatus5] bit SUBSTATUS_LOCK_ON, a ret z - -; 50% chance to greatly encourage this move. + ; 50% chance to greatly encourage this move. call AI_50_50 ret c - dec [hl] dec [hl] ret - .greatly_discourage inc [hl] .discourage @@ -1871,61 +1838,48 @@ AI_Smart_Endure: AI_Smart_FuryCutter: ; Encourage this move based on Fury Cutter's count. - ld a, [wEnemyFuryCutterCount] and a jr z, AI_Smart_Rollout dec [hl] - cp 2 jr c, AI_Smart_Rollout dec [hl] dec [hl] - cp 3 jr c, AI_Smart_Rollout dec [hl] dec [hl] dec [hl] - ; fallthrough - -AI_Smart_Rollout: -; Rollout, Fury Cutter - -; 80% chance to discourage this move if the enemy is in love, confused, or paralyzed. +AI_Smart_Rollout: ; Rollout, Fury Cutter + ; 80% chance to discourage this move if the enemy is in love, confused, or paralyzed. ld a, [wEnemySubStatus1] bit SUBSTATUS_IN_LOVE, a jr nz, .maybe_discourage - ld a, [wEnemySubStatus3] bit SUBSTATUS_CONFUSED, a jr nz, .maybe_discourage - ld a, [wEnemyMonStatus] bit PAR, a jr nz, .maybe_discourage - -; 80% chance to discourage this move if the enemy's HP is below 25%, -; or if accuracy or evasion modifiers favour the player. + ; 80% chance to discourage this move if the enemy's HP is below 25%, + ; or if accuracy or evasion modifiers favour the player. call AICheckEnemyQuarterHP jr nc, .maybe_discourage - ld a, [wEnemyAccLevel] cp BASE_STAT_LEVEL jr c, .maybe_discourage ld a, [wPlayerEvaLevel] cp BASE_STAT_LEVEL + 1 jr nc, .maybe_discourage - -; 80% chance to greatly encourage this move otherwise. + ; 80% chance to greatly encourage this move otherwise. call Random cp 79 percent - 1 ret nc dec [hl] dec [hl] ret - .maybe_discourage call AI_80_20 ret c @@ -1936,16 +1890,13 @@ AI_Smart_Swagger: AI_Smart_Attract: ; 80% chance to encourage this move during the first turn of player's Pokemon. ; 80% chance to discourage this move otherwise. - ld a, [wPlayerTurnsTaken] and a jr z, .first_turn - call AI_80_20 ret c inc [hl] ret - .first_turn call Random cp 79 percent - 1 @@ -1955,7 +1906,6 @@ AI_Smart_Attract: AI_Smart_Safeguard: ; 80% chance to discourage this move if player's HP is below 50%. - call AICheckPlayerHalfHP ret c call AI_80_20 @@ -1965,38 +1915,31 @@ AI_Smart_Safeguard: AI_Smart_Magnitude: AI_Smart_Earthquake: -; Greatly encourage this move if the player is underground and the enemy is faster. + ; Greatly encourage this move if the player is underground and the enemy is faster. ld a, [wLastPlayerCounterMove] cp DIG ret nz - ld a, [wPlayerSubStatus3] bit SUBSTATUS_UNDERGROUND, a jr z, .could_dig - call AICompareSpeed ret nc dec [hl] dec [hl] ret - .could_dig ; Try to predict if the player will use Dig this turn. - ; 50% chance to encourage this move if the enemy is slower than the player. call AICompareSpeed ret c - call AI_50_50 ret c - dec [hl] ret AI_Smart_BatonPass: ; Discourage this move if the player hasn't shown super-effective moves against the enemy. ; Consider player's type(s) if its moves are unknown. - push hl callfar CheckPlayerMoveTypeMatchups ld a, [wEnemyAISwitchScore] @@ -2009,14 +1952,12 @@ AI_Smart_BatonPass: AI_Smart_Pursuit: ; 50% chance to greatly encourage this move if player's HP is below 25%. ; 80% chance to discourage this move otherwise. - call AICheckPlayerQuarterHP jr nc, .encourage call AI_80_20 ret c inc [hl] ret - .encourage call AI_50_50 ret c @@ -2027,23 +1968,18 @@ AI_Smart_Pursuit: AI_Smart_RapidSpin: ; 80% chance to greatly encourage this move if the enemy is ; trapped (Bind effect), seeded, or scattered with spikes. - ld a, [wEnemyWrapCount] and a jr nz, .encourage - ld a, [wEnemySubStatus4] bit SUBSTATUS_LEECH_SEED, a jr nz, .encourage - ld a, [wEnemyScreens] bit SCREENS_SPIKES, a ret z - .encourage call AI_80_20 ret c - dec [hl] dec [hl] ret @@ -2052,36 +1988,29 @@ AI_Smart_HiddenPower: push hl ld a, 1 ldh [hBattleTurn], a - -; Calculate Hidden Power's type and base power based on enemy's DVs. + ; Calculate Hidden Power's type and base power based on enemy's DVs. callfar HiddenPowerDamage callfar BattleCheckTypeMatchup pop hl - -; Discourage Hidden Power if not very effective. + ; Discourage Hidden Power if not very effective. ld a, [wTypeMatchup] cp EFFECTIVE jr c, .bad - -; Discourage Hidden Power if its base power is lower than 50. + ; Discourage Hidden Power if its base power is lower than 50. ld a, d cp 50 jr c, .bad - -; Encourage Hidden Power if super-effective. + ; Encourage Hidden Power if super-effective. ld a, [wTypeMatchup] cp EFFECTIVE + 1 jr nc, .good - -; Encourage Hidden Power if its base power is 70. + ; Encourage Hidden Power if its base power is 70. ld a, d cp 70 ret c - .good dec [hl] ret - .bad inc [hl] ret @@ -2094,13 +2023,11 @@ AI_Smart_RainDance: jr z, AIBadWeatherType cp FIRE jr z, AIGoodWeatherType - ld a, [wBattleMonType2] cp WATER jr z, AIBadWeatherType cp FIRE jr z, AIGoodWeatherType - push hl ld hl, RainDanceMoves jr AI_Smart_WeatherMove @@ -2115,35 +2042,26 @@ AI_Smart_SunnyDay: jr z, AIBadWeatherType cp WATER jr z, AIGoodWeatherType - ld a, [wBattleMonType2] cp FIRE jr z, AIBadWeatherType cp WATER jr z, AIGoodWeatherType - push hl ld hl, SunnyDayMoves - ; fallthrough - -AI_Smart_WeatherMove: -; Rain Dance, Sunny Day - -; Greatly discourage this move if the enemy doesn't have -; one of the useful Rain Dance or Sunny Day moves. +AI_Smart_WeatherMove: ; Rain Dance, Sunny Day + ; Greatly discourage this move if the enemy doesn't have + ; one of the useful Rain Dance or Sunny Day moves. call AIHasMoveInArray pop hl jr nc, AIBadWeatherType - -; Greatly discourage this move if player's HP is below 50%. + ; Greatly discourage this move if player's HP is below 50%. call AICheckPlayerHalfHP jr nc, AIBadWeatherType - -; 50% chance to encourage this move otherwise. + ; 50% chance to encourage this move otherwise. call AI_50_50 ret c - dec [hl] ret @@ -2153,24 +2071,19 @@ AIBadWeatherType: inc [hl] ret -AIGoodWeatherType: -; Rain Dance, Sunny Day - -; Greatly encourage this move if it would disfavour the player type-wise and player's HP is above 50%... +AIGoodWeatherType: ; Rain Dance, Sunny Day + ; Greatly encourage this move if it would disfavour the player type-wise and player's HP is above 50%... call AICheckPlayerHalfHP ret nc - -; ...as long as one of the following conditions meet: -; It's the first turn of the player's Pokemon. + ; ...as long as one of the following conditions meet: + ; It's the first turn of the player's Pokemon. ld a, [wPlayerTurnsTaken] and a jr z, .good - -; Or it's the first turn of the enemy's Pokemon. + ; Or it's the first turn of the enemy's Pokemon. ld a, [wEnemyTurnsTaken] and a ret nz - .good dec [hl] dec [hl] @@ -2181,19 +2094,14 @@ INCLUDE "data/battle/ai/sunny_day_moves.asm" AI_Smart_BellyDrum: ; Dismiss this move if enemy's attack is higher than +2 or if enemy's HP is below 50%. ; Else, discourage this move if enemy's HP is not full. - ld a, [wEnemyAtkLevel] cp BASE_STAT_LEVEL + 3 jr nc, .discourage - call AICheckEnemyMaxHP ret c - inc [hl] - call AICheckEnemyHalfHP ret c - .discourage ld a, [hl] add 5 @@ -2205,9 +2113,8 @@ AI_Smart_PsychUp: ld hl, wEnemyAtkLevel ld b, NUM_LEVEL_STATS ld c, 100 - -; Calculate the sum of all enemy's stat level modifiers. Add 100 first to prevent underflow. -; Put the result in c. c will range between 58 and 142. + ; Calculate the sum of all enemy's stat level modifiers. Add 100 first to prevent underflow. + ; Put the result in c. c will range between 58 and 142. .enemy_loop ld a, [hli] sub BASE_STAT_LEVEL @@ -2215,13 +2122,11 @@ AI_Smart_PsychUp: ld c, a dec b jr nz, .enemy_loop - -; Calculate the sum of all player's stat level modifiers. Add 100 first to prevent underflow. -; Put the result in d. d will range between 58 and 142. + ; Calculate the sum of all player's stat level modifiers. Add 100 first to prevent underflow. + ; Put the result in d. d will range between 58 and 142. ld hl, wPlayerAtkLevel ld b, NUM_LEVEL_STATS ld d, 100 - .player_loop ld a, [hli] sub BASE_STAT_LEVEL @@ -2229,29 +2134,23 @@ AI_Smart_PsychUp: ld d, a dec b jr nz, .player_loop - -; Greatly discourage this move if enemy's stat levels are higher than player's (if c>=d). + ; Greatly discourage this move if enemy's stat levels are higher than player's (if c>=d). ld a, c sub d pop hl jr nc, .discourage - -; Else, 80% chance to encourage this move unless player's accuracy level is lower than -1... + ; Else, 80% chance to encourage this move unless player's accuracy level is lower than -1... ld a, [wPlayerAccLevel] cp BASE_STAT_LEVEL - 1 ret c - -; ...or enemy's evasion level is higher than +0. + ; ...or enemy's evasion level is higher than +0. ld a, [wEnemyEvaLevel] cp BASE_STAT_LEVEL + 1 ret nc - call AI_80_20 ret c - dec [hl] ret - .discourage inc [hl] inc [hl] @@ -2262,85 +2161,64 @@ AI_Smart_MirrorCoat: ld hl, wPlayerUsedMoves ld c, NUM_MOVES ld b, 0 - .playermoveloop ld a, [hli] and a jr z, .skipmove - call AIGetEnemyMove - ld a, [wEnemyMoveStruct + MOVE_POWER] and a jr z, .skipmove - ld a, [wEnemyMoveStruct + MOVE_TYPE] cp SPECIAL jr c, .skipmove - inc b - .skipmove dec c jr nz, .playermoveloop - pop hl ld a, b and a jr z, .discourage - cp 3 jr nc, .encourage - ld a, [wLastPlayerCounterMove] and a jr z, .done - call AIGetEnemyMove - ld a, [wEnemyMoveStruct + MOVE_POWER] and a jr z, .done - ld a, [wEnemyMoveStruct + MOVE_TYPE] cp SPECIAL jr c, .done - .encourage call Random cp 39 percent + 1 jr c, .done dec [hl] - .done ret - .discourage inc [hl] ret AI_Smart_Twister: AI_Smart_Gust: -; Greatly encourage this move if the player is flying and the enemy is faster. + ; Greatly encourage this move if the player is flying and the enemy is faster. ld a, [wLastPlayerCounterMove] cp FLY ret nz - ld a, [wPlayerSubStatus3] bit SUBSTATUS_FLYING, a jr z, .couldFly - call AICompareSpeed ret nc - dec [hl] dec [hl] ret - -; Try to predict if the player will use Fly this turn. .couldFly - -; 50% chance to encourage this move if the enemy is slower than the player. + ; 50% chance to encourage this move if the enemy is slower than the player. call AICompareSpeed ret c call AI_50_50 @@ -2351,75 +2229,59 @@ AI_Smart_Gust: AI_Smart_FutureSight: ; Greatly encourage this move if the player is ; flying or underground, and slower than the enemy. - call AICompareSpeed ret nc - ld a, [wPlayerSubStatus3] and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND ret z - dec [hl] dec [hl] ret AI_Smart_Stomp: ; 80% chance to encourage this move if the player has used Minimize. - ld a, [wPlayerMinimized] and a ret z - call AI_80_20 ret c - dec [hl] ret AI_Smart_Solarbeam: ; 80% chance to encourage this move when it's sunny. ; 90% chance to discourage this move when it's raining. - ld a, [wBattleWeather] cp WEATHER_SUN jr z, .encourage - cp WEATHER_RAIN ret nz - call Random cp 10 percent ret c - inc [hl] inc [hl] ret - .encourage call AI_80_20 ret c - dec [hl] dec [hl] ret AI_Smart_Thunder: ; 90% chance to discourage this move when it's sunny. - ld a, [wBattleWeather] cp WEATHER_SUN ret nz - call Random cp 10 percent ret c - inc [hl] ret AICompareSpeed: ; Return carry if enemy is faster than player. - push bc ld a, [wEnemyMonSpeed + 1] ld b, a @@ -2447,26 +2309,21 @@ AICheckEnemyMaxHP: ld de, wEnemyMonHP ld hl, wEnemyMonMaxHP ; fallthrough - AICheckMaxHP: ; Return carry if hp at de matches max hp at hl. - ld a, [de] inc de cp [hl] jr nz, .not_max - inc hl ld a, [de] cp [hl] jr nz, .not_max - pop bc pop de pop hl scf ret - .not_max pop bc pop de @@ -2556,30 +2413,23 @@ AICheckPlayerQuarterHP: AIHasMoveEffect: ; Return carry if the enemy has move b. - push hl ld hl, wEnemyMonMoves ld c, NUM_MOVES - .checkmove ld a, [hli] and a jr z, .no - call AIGetEnemyMove - ld a, [wEnemyMoveStruct + MOVE_EFFECT] cp b jr z, .yes - dec c jr nz, .checkmove - .no pop hl and a ret - .yes pop hl scf @@ -2587,31 +2437,24 @@ AIHasMoveEffect: AIHasMoveInArray: ; Return carry if the enemy has a move in array hl. - push hl push de push bc - .next ld a, [hli] cp -1 jr z, .done - ld b, a ld c, NUM_MOVES + 1 ld de, wEnemyMonMoves - .check dec c jr z, .next - ld a, [de] inc de cp b jr nz, .check - scf - .done pop bc pop de diff --git a/engine/events/mom.asm b/engine/events/mom.asm index 550052e1a00..e7621ae4fac 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -552,26 +552,15 @@ Mom_WithdrawDepositMenuJoypad: ret .DigitQuantities: - dt 100000 - dt 10000 - dt 1000 - dt 100 - dt 10 - dt 1 - - dt 100000 - dt 10000 - dt 1000 - dt 100 - dt 10 - dt 1 - - dt 900000 - dt 90000 - dt 9000 - dt 900 - dt 90 - dt 9 + for x, 5, -1, -1 + bigdt 10**x + endr + for x, 5, -1, -1 + bigdt 10**x + endr + for x, 5, -1, -1 + bigdt 9 * 10**x + endr MomLeavingText1: text_far _MomLeavingText1 diff --git a/engine/events/money.asm b/engine/events/money.asm index c8f9d058e1d..4558fd7e043 100644 --- a/engine/events/money.asm +++ b/engine/events/money.asm @@ -23,7 +23,7 @@ GiveMoney:: ret MaxMoney: - dt MAX_MONEY + bigdt MAX_MONEY TakeMoney:: ld a, 3 diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm index 4fc03b936a8..c43b6883717 100644 --- a/engine/events/sweet_scent.asm +++ b/engine/events/sweet_scent.asm @@ -34,7 +34,7 @@ SweetScentEncounter: jr nc, .no_battle ld hl, wStatusFlags2 bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] - jr nz, .not_in_bug_contest + jr nz, .in_bug_contest farcall GetMapEncounterRate ld a, b and a @@ -43,7 +43,7 @@ SweetScentEncounter: jr nz, .no_battle jr .start_battle -.not_in_bug_contest +.in_bug_contest farcall ChooseWildEncounter_BugContest .start_battle diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index cde8896a1a1..2ce21ba9958 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -787,8 +787,6 @@ MoonBallMultiplier: pop bc ret nz inc hl - inc hl - inc hl push bc ld a, BANK("Evolutions and Attacks") call GetFarByte diff --git a/macros/data.asm b/macros/data.asm index 350fa5a3b62..cb26bbc638b 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -55,16 +55,25 @@ MACRO dc ; "crumbs" endr ENDM -MACRO dt ; three-byte (big-endian) - db LOW((\1) >> 16), HIGH(\1), LOW(\1) +MACRO bigdw ; big-endian word + rept _NARG + db HIGH(\1), LOW(\1) + shift + endr ENDM -MACRO dd ; four-byte (big-endian) - db HIGH((\1) >> 16), LOW((\1) >> 16), HIGH(\1), LOW(\1) +MACRO bigdt ; big-endian "tribyte" + rept _NARG + db LOW((\1) >> 16), HIGH(\1), LOW(\1) + shift + endr ENDM -MACRO bigdw ; big-endian word - db HIGH(\1), LOW(\1) +MACRO bigdd ; big-endian "double word" + rept _NARG + db HIGH((\1) >> 16), LOW((\1) >> 16), HIGH(\1), LOW(\1) + shift + endr ENDM MACRO dba ; dbw bank, address diff --git a/macros/legacy.asm b/macros/legacy.asm index 861d8de8686..8520061d1a6 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -13,6 +13,14 @@ ENDM ; macros/data.asm +MACRO dt + bigdt \1 +ENDM + +MACRO dd + bigdd \1 +ENDM + MACRO dbbw db \1, \2 dw \3 diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index e9894c7081a..09b666cfbb8 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -229,21 +229,21 @@ ENDM MACRO givemoney db givemoney_command db \1 ; account - dt \2 ; money + bigdt \2 ; money ENDM const takemoney_command ; $23 MACRO takemoney db takemoney_command db \1 ; account - dt \2 ; money + bigdt \2 ; money ENDM const checkmoney_command ; $24 MACRO checkmoney db checkmoney_command db \1 ; account - dt \2 ; money + bigdt \2 ; money ENDM const givecoins_command ; $25 diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm deleted file mode 100644 index 14cf8a3bb34..00000000000 --- a/maps/BillsBrothersHouse.asm +++ /dev/null @@ -1,41 +0,0 @@ - object_const_def - const BILLSBROTHERSHOUSE_POKEFAN_F - const BILLSBROTHERSHOUSE_YOUNGSTER - -BillsBrothersHouse_MapScripts: - def_scene_scripts - - def_callbacks - -BillsBrotherScript: - jumptextfaceplayer BillsBrotherText - -BillsBrothersHouseYoungsterScript: - jumptextfaceplayer BillsBrothersHouseYoungsterText - -BillsBrotherText: - text "My grandpa is at " - line "my brother BILL's" - cont "on CERULEAN CAPE." - done - -BillsBrothersHouseYoungsterText: - text "I saw these weird," - line "slow #MON on" - cont "CYCLING ROAD." - done - -BillsBrothersHouse_MapEvents: - db 0, 0 ; filler - - def_warp_events - warp_event 2, 7, FUCHSIA_CITY, 4 - warp_event 3, 7, FUCHSIA_CITY, 4 - - def_coord_events - - def_bg_events - - def_object_events - object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1 - object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1 diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index 07e61032ea6..3c24d37ecfb 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -65,12 +65,12 @@ BillsMomScript: closetext end -BillsSisterScript: +BillsYoungerSisterScript: faceplayer opentext checkcellnum PHONE_BILL iftrue .GotBillsNumber - writetext BillsSisterUsefulNumberText + writetext BillsYoungerSisterUsefulNumberText askforphonenumber PHONE_BILL ifequal PHONE_CONTACTS_FULL, .NoRoom ifequal PHONE_CONTACT_REFUSED, .Refused @@ -81,19 +81,19 @@ BillsSisterScript: waitsfx promptbutton .GotBillsNumber: - writetext BillsSisterStorageSystemText + writetext BillsYoungerSisterStorageSystemText waitbutton closetext end .Refused: - writetext BillsSisterRefusedNumberText + writetext BillsYoungerSisterRefusedNumberText waitbutton closetext end .NoRoom: - writetext BillsSisterPhoneFullText + writetext BillsYoungerSisterPhoneFullText promptbutton sjump .Refused @@ -204,7 +204,7 @@ BillsMomText_AfterEcruteak: line "father." done -BillsSisterUsefulNumberText: +BillsYoungerSisterUsefulNumberText: text "Are you a trainer?" para "I've got a useful" @@ -217,7 +217,7 @@ RecordedBillsNumberText: line "BILL's number." done -BillsSisterRefusedNumberText: +BillsYoungerSisterRefusedNumberText: text "My brother made" line "the PC #MON" cont "storage system." @@ -227,12 +227,12 @@ BillsSisterRefusedNumberText: cont "number…" done -BillsSisterPhoneFullText: +BillsYoungerSisterPhoneFullText: text "You can't record" line "any more numbers." done -BillsSisterStorageSystemText: +BillsYoungerSisterStorageSystemText: text "My big brother" line "BILL made the PC" @@ -257,4 +257,4 @@ BillsFamilysHouse_MapEvents: def_object_events object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1 - object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1 + object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsYoungerSisterScript, -1 diff --git a/maps/BillsOlderSistersHouse.asm b/maps/BillsOlderSistersHouse.asm new file mode 100644 index 00000000000..4569f1f5352 --- /dev/null +++ b/maps/BillsOlderSistersHouse.asm @@ -0,0 +1,41 @@ + object_const_def + const BILLSOLDERSISTERSHOUSE_POKEFAN_F + const BILLSOLDERSISTERSHOUSE_YOUNGSTER + +BillsOlderSistersHouse_MapScripts: + def_scene_scripts + + def_callbacks + +BillsOlderSisterScript: + jumptextfaceplayer BillsOlderSisterText + +BillsOlderSistersHouseYoungsterScript: + jumptextfaceplayer BillsOlderSistersHouseYoungsterText + +BillsOlderSisterText: + text "My grandpa is at " + line "my brother BILL's" + cont "on CERULEAN CAPE." + done + +BillsOlderSistersHouseYoungsterText: + text "I saw these weird," + line "slow #MON on" + cont "CYCLING ROAD." + done + +BillsOlderSistersHouse_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 2, 7, FUCHSIA_CITY, 4 + warp_event 3, 7, FUCHSIA_CITY, 4 + + def_coord_events + + def_bg_events + + def_object_events + object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsOlderSisterScript, -1 + object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsOlderSistersHouseYoungsterScript, -1 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 5fe9f0bce67..bec401a4e6b 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -129,7 +129,7 @@ FuchsiaCity_MapEvents: warp_event 5, 13, FUCHSIA_MART, 2 warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1 warp_event 8, 27, FUCHSIA_GYM, 1 - warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1 + warp_event 11, 27, BILLS_OLDER_SISTERS_HOUSE, 1 warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1 warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1 warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; inaccessible diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index b73cdac9a8c..8ecebd39063 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -489,21 +489,21 @@ endr pop bc ret ._9 - dd 1000000000 + bigdd 10**9 ._8 - dd 100000000 + bigdd 10**8 ._7 - dd 10000000 + bigdd 10**7 ._6 - dd 1000000 + bigdd 10**6 ._5 - dd 100000 + bigdd 10**5 ._4 - dd 10000 + bigdd 10**4 ._3 - dd 1000 + bigdd 10**3 ._2 - dd 100 + bigdd 10**2 .Function1062b2: ld c, $0 .asm_1062b4 diff --git a/tools/.gitignore b/tools/.gitignore index 7825a9e6549..7f8ecffa8f5 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -1,4 +1,4 @@ -bpp2png +gbcpal gfx lzcomp make_patch diff --git a/tools/Makefile b/tools/Makefile index 3c213f0d05d..d17d10ec9fa 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -4,9 +4,9 @@ CC := gcc CFLAGS := -O3 -flto -std=c11 -Wall -Wextra -pedantic tools := \ - bpp2png \ - lzcomp \ + gbcpal \ gfx \ + lzcomp \ make_patch \ png_dimensions \ pokemon_animation \ @@ -20,19 +20,9 @@ all: $(tools) clean: $(RM) $(tools) -gfx: common.h -png_dimensions: common.h -pokemon_animation: common.h -pokemon_animation_graphics: common.h -scan_includes: common.h -stadium: common.h - -bpp2png: bpp2png.c lodepng/lodepng.c common.h lodepng/lodepng.h - $(CC) $(CFLAGS) -o $@ bpp2png.c lodepng/lodepng.c - lzcomp: CFLAGS += -Wno-strict-overflow -Wno-sign-compare lzcomp: $(wildcard lz/*.c) $(wildcard lz/*.h) $(CC) $(CFLAGS) -o $@ lz/*.c -%: %.c +%: %.c common.h $(CC) $(CFLAGS) -o $@ $< diff --git a/tools/bpp2png.c b/tools/bpp2png.c deleted file mode 100644 index 52e58764b75..00000000000 --- a/tools/bpp2png.c +++ /dev/null @@ -1,243 +0,0 @@ -#define PROGRAM_NAME "bpp2png" -#define USAGE_OPTS "[-h|--help] [-w width] [-d depth] [-p in.gbcpal] [-t] in.2bpp|in.1bpp out.png" - -#include "common.h" -#include "lodepng/lodepng.h" - -struct Options { - unsigned int width; - unsigned int depth; - const char *palette; - bool transpose; -}; - -typedef uint8_t Palette[4][3]; - -void parse_args(int argc, char *argv[], struct Options *options) { - struct option long_options[] = { - {"width", required_argument, 0, 'w'}, - {"depth", required_argument, 0, 'd'}, - {"palette", required_argument, 0, 'p'}, - {"transpose", no_argument, 0, 't'}, - {"help", no_argument, 0, 'h'}, - {0} - }; - for (int opt; (opt = getopt_long(argc, argv, "w:d:p:th", long_options)) != -1;) { - switch (opt) { - case 'w': - options->width = (unsigned int)strtoul(optarg, NULL, 0); - if (options->width % 8) { - error_exit("Width not divisible by 8 px: %u\n", options->width); - } - break; - case 'd': - options->depth = (unsigned int)strtoul(optarg, NULL, 0); - if (options->depth != 1 && options->depth != 2) { - error_exit("Depth is not 1 or 2: %u\n", options->depth); - } - break; - case 'p': - options->palette = optarg; - break; - case 't': - options->transpose = true; - break; - case 'h': - usage_exit(0); - break; - default: - usage_exit(1); - } - } -} - -bool is_1bpp(const char *filename) { - const char *end = strrchr(filename, '.'); - return end && strlen(end) == 5 && end[1] == '1' && (end[2] == 'b' || end[2] == 'B') - && (end[3] == 'p' || end[3] == 'P') && (end[4] == 'p' || end[4] == 'P'); -} - -uint8_t *extend_1bpp_to_2bpp(uint8_t *bpp_data, long *size) { - *size *= 2; - bpp_data = xrealloc(bpp_data, *size); - for (long i = *size - 2; i >= 0; i -= 2) { - bpp_data[i] = bpp_data[i + 1] = bpp_data[i >> 1]; - } - return bpp_data; -} - -void mingle_2bpp_planes(uint8_t *bpp_data, long size) { - for (long i = 0; i < size; i += 2) { - // Interleave aka "mingle" bits - // -#define EXPAND_PLANE(b) (((((b) * 0x0101010101010101ULL & 0x8040201008040201ULL) * 0x0102040810204081ULL) >> 48) & 0xAAAA) - uint16_t r = (EXPAND_PLANE(bpp_data[i]) >> 1) | EXPAND_PLANE(bpp_data[i + 1]); - bpp_data[i] = r >> 8; - bpp_data[i + 1] = r & 0xff; - } -} - -unsigned int calculate_size(long bytes, unsigned int *width) { - long pixels = bytes * 4; - if (pixels % (8 * 8)) { - return 0; - } - if (!*width) { - // If no width is specified, try to guess an appropriate one -#define GUESS_SIZE(w, h) pixels == (w) * (h) * 8 * 8 ? (w) * 8 - *width = GUESS_SIZE(5, 5) // mon pic - : GUESS_SIZE(6, 6) // mon front/back pic - : GUESS_SIZE(7, 7) // mon/trainer pic - : GUESS_SIZE(2, 4) // mon icon - : GUESS_SIZE(2, 12) // walking sprite - : GUESS_SIZE(2, 6) // standing sprite - : GUESS_SIZE(2, 2) // still sprite - : GUESS_SIZE(4, 4) // big sprite - : pixels > 16 * 8 * 8 ? 16 * 8 // maximum width - : (unsigned int)(pixels / 8); - } - unsigned int height = (unsigned int)((pixels + *width * 8 - 1) / (*width * 8) * 8); - if (*width == 0 || height == 0) { - error_exit("Not divisible into 8x8-px tiles: %ux%u\n", *width, height); - } - return height; -} - -uint8_t *pad_to_rectangle(uint8_t *bpp_data, long filesize, unsigned int width, unsigned int height) { - unsigned int size = width * height / 4; - if (size > filesize) { - bpp_data = xrealloc(bpp_data, size); - // Fill padding with white - memset(bpp_data + filesize, 0, size - filesize); - } - return bpp_data; -} - -uint8_t *transpose_tiles(uint8_t *bpp_data, unsigned int width, unsigned int height) { - unsigned int size = width * height / 4; - uint8_t *transposed = xmalloc(size); - unsigned int cols = width / 8; - for (unsigned int i = 0; i < size; i++) { - unsigned int j = (i / 0x10) * cols * 0x10; - j = (j % size) + 0x10 * (j / size) + (i % 0x10); - transposed[j] = bpp_data[i]; - } - free(bpp_data); - return transposed; -} - -uint8_t *rearrange_tiles_to_scanlines(uint8_t *bpp_data, unsigned int width, unsigned int height) { - unsigned int size = width * height / 4; - uint8_t *rearranged = xmalloc(size); - unsigned int cols = width / 8; - unsigned int j = 0; - for (unsigned int line = 0; line < height; line++) { - unsigned int row = line / 8; - for (unsigned int col = 0; col < cols; col++) { - unsigned int i = ((row * cols + col) * 8 + line % 8) * 2; - rearranged[j] = bpp_data[i]; - rearranged[j + 1] = bpp_data[i + 1]; - j += 2; - } - } - free(bpp_data); - return rearranged; -} - -void read_gbcpal(Palette palette, const char *filename) { - long filesize; - uint8_t *pal_data = read_u8(filename, &filesize); - if (filesize < 4 * 2) { - error_exit("Invalid .gbcpal file: \"%s\"\n", filename); - } - for (int i = 0; i < 4; i++) { - uint8_t b1 = pal_data[i * 2], b2 = pal_data[i * 2 + 1]; -#define RGB5_TO_RGB8(x) (uint8_t)(((x) << 3) | ((x) >> 2)) - palette[i][0] = RGB5_TO_RGB8(b1 & 0x1f); // red - palette[i][1] = RGB5_TO_RGB8(((b1 & 0xe0) >> 5) | ((b2 & 0x03) << 3)); // green - palette[i][2] = RGB5_TO_RGB8((b2 & 0x7c) >> 2); // blue - } - free(pal_data); -} - -unsigned int write_png(const char *filename, uint8_t *bpp_data, unsigned int depth, - unsigned int width, unsigned int height, Palette palette) { - LodePNGState state; - lodepng_state_init(&state); - state.encoder.auto_convert = 0; // Always use the colortype we specify - state.info_raw.bitdepth = state.info_png.color.bitdepth = depth; - - if (palette) { - state.info_raw.colortype = state.info_png.color.colortype = LCT_PALETTE; - for (int i = 0; i < 4; i++) { - uint8_t *color = palette[i]; - lodepng_palette_add(&state.info_raw, color[0], color[1], color[2], 0xff); - lodepng_palette_add(&state.info_png.color, color[0], color[1], color[2], 0xff); - } - } else { - state.info_raw.colortype = state.info_png.color.colortype = LCT_GREY; - // 2-bit PNG white/light/dark/gray indexes are the inverse of 2bpp - for (unsigned int i = 0; i < width * height / 4; i++) { - bpp_data[i] = ~bpp_data[i]; - } - } - - unsigned char *buffer; - size_t buffer_size; - lodepng_encode(&buffer, &buffer_size, bpp_data, width, height, &state); - unsigned int error = state.error; - lodepng_state_cleanup(&state); - if (!error) { - error = lodepng_save_file(buffer, buffer_size, filename); - } - - free(buffer); - return error; -} - -int main(int argc, char *argv[]) { - struct Options options = {0}; - parse_args(argc, argv, &options); - - argc -= optind; - argv += optind; - if (argc != 2) { - usage_exit(1); - } - - Palette palette = {0}; - if (options.palette) { - read_gbcpal(palette, options.palette); - } - - const char *bpp_filename = argv[0]; - long filesize; - uint8_t *bpp_data = read_u8(bpp_filename, &filesize); - if (!options.depth) { - options.depth = is_1bpp(bpp_filename) ? 1 : 2; - } - if (!filesize || filesize % (8 * options.depth)) { - error_exit("Invalid .%dbpp file: \"%s\"\n", options.depth, bpp_filename); - } - if (options.depth == 1) { - bpp_data = extend_1bpp_to_2bpp(bpp_data, &filesize); - } - mingle_2bpp_planes(bpp_data, filesize); - - unsigned int height = calculate_size(filesize, &options.width); - bpp_data = pad_to_rectangle(bpp_data, filesize, options.width, height); - if (options.transpose) { - bpp_data = transpose_tiles(bpp_data, options.width, height); - } - bpp_data = rearrange_tiles_to_scanlines(bpp_data, options.width, height); - - const char *png_filename = argv[1]; - unsigned int error = write_png(png_filename, bpp_data, options.depth, options.width, height, - options.palette ? palette : NULL); - if (error) { - error_exit("Could not write to file \"%s\": %s\n", png_filename, lodepng_error_text(error)); - } - - free(bpp_data); - return 0; -} diff --git a/tools/compare.sh b/tools/compare.sh deleted file mode 100755 index d013a88ab83..00000000000 --- a/tools/compare.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# Compares baserom.gbc and pokecrystal.gbc - -# create baserom.txt if necessary -if [ ! -f baserom.txt ]; then - hexdump -C baserom.gbc > baserom.txt -fi - -hexdump -C pokecrystal.gbc > pokecrystal.txt - -diff -u baserom.txt pokecrystal.txt | less diff --git a/tools/compare2.sh b/tools/compare2.sh deleted file mode 100755 index 64695229e58..00000000000 --- a/tools/compare2.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# Compares baserom.gbc and pokecrystal.gbc - -# create baserom.txt if necessary -crystal_md5=9f2922b235a5eeb78d65594e82ef5dde -if [ ! -f baserom.gbc ]; then - echo "FATAL: Baserom not found" - exit 1 -fi - -if [ $1 ]; then - if [ $1 == "-v" ]; then - verbose=1 - else - verbose = 0 - fi -else - verbose=0 -fi - -base_md5=`md5sum baserom.gbc | cut -d' ' -f1` -if [ $verbose == 1 ]; then - echo "baserom.gbc: $base_md5" -fi -if [ $base_md5 != $crystal_md5 ]; then - echo "FATAL: Baserom is incorrect" - exit 1 -fi - -built_md5=`md5sum pokecrystal.gbc | cut -d' ' -f1` -if [ $verbose == 1 ]; then - echo "pokecrystal.gbc: $built_md5" -fi -if [ $built_md5 != $crystal_md5 ] -then - if [ $verbose == 1 ]; then - echo "Checksums do not match, here's where the ROMs differ..." - fi - if [ ! -f baserom.txt ]; then - hexdump -C baserom.gbc > baserom.txt - fi - - hexdump -C pokecrystal.gbc > pokecrystal.txt - - diff -u baserom.txt pokecrystal.txt | less -else - if [ $verbose == 1 ]; then - echo "Checksums match! :D" - fi -fi - diff --git a/tools/consts.py b/tools/consts.py deleted file mode 100755 index 37c859515cf..00000000000 --- a/tools/consts.py +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -Usage: python consts.py constants/some_constants.asm - -View numeric values of `const`ants. -""" - -import sys -import re - -const_value = 0 -const_inc = 1 - -def asm_int(s): - base = {'$': 16, '&': 8, '%': 2}.get(s[0], 10) - return int(s if base == 10 else s[1:], base) - -def print_const(s, v): - print(f'{s} == {v} == ${v:x}') - -def parse_for_constants(line): - global const_value, const_inc - if not (m := re.match(r'^\s+([A-Za-z_][A-Za-z0-9_@#]*)(?:\s+([^;\\n]+))?', line)): - return - macro, rest = m.groups() - args = [arg.strip() for arg in rest.split(',')] if rest else [] - if args and not args[-1]: - args = args[:-1] - if macro == 'const_def': - const_value = asm_int(args[0]) if len(args) >= 1 else 0 - const_inc = asm_int(args[1]) if len(args) >= 2 else 1 - elif macro == 'const': - print_const(args[0], const_value) - const_value += const_inc - elif macro == 'shift_const': - print_const(args[0], 1 << const_value) - print_const(args[0] + '_F', const_value) - const_value += const_inc - elif macro == 'const_skip': - const_value += const_inc * (asm_int(args[0]) if len(args) >= 1 else 1) - elif macro == 'const_next': - const_value = asm_int(args[0]) - -def main(): - if len(sys.argv) < 2: - print(f'Usage: {sys.argv[0]} constants/some_constants.asm', file=sys.stderr) - sys.exit(1) - for filename in sys.argv[1:]: - with open(filename, 'r', encoding='utf-8') as file: - for line in file: - parse_for_constants(line) - -if __name__ == '__main__': - main() diff --git a/tools/dupeframes.py b/tools/dupeframes.py deleted file mode 100755 index 0799bdc4591..00000000000 --- a/tools/dupeframes.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -Usage: python dupeframes.py - -Check for duplicate frames in Pokemon sprites (gfx/pokemon/*/front.png). -""" - -import sys -import glob - -import png - -def duplicate_frames(filename): - with open(filename, 'rb') as file: - width, height, rows = png.Reader(file).asRGBA8()[:3] - rows = list(rows) - if height % width: - print(f'{filename} is not a vertical strip of square frames!', file=sys.stderr) - return - num_frames = height // width - frames = [rows[i*width:(i+1)*width] for i in range(num_frames)] - yield from ((i, j) for i in range(num_frames) for j in range(i+1, num_frames) if frames[i] == frames[j]) - -def main(): - for filename in sorted(glob.glob('gfx/pokemon/*/front.png')): - for (i, j) in duplicate_frames(filename): - print(f'{filename}: frame {j} is a duplicate of frame {i}', file=sys.stderr) - -if __name__ == '__main__': - main() diff --git a/tools/free_space.awk b/tools/free_space.awk deleted file mode 100755 index 168fde85dcb..00000000000 --- a/tools/free_space.awk +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/gawk -f - -# Usage: tools/free_space.awk [BANK=] pokecrystal.map - -# The BANK argument allows printing free space in one, all, or none of the ROM's banks. -# Valid arguments are numbers (in decimal "42" or hexadecimal "0x2a"), "all" or "none". -# If not specified, defaults to "none". -# The `BANK` argument MUST be before the map file name, otherwise it has no effect! -# Yes: tools/free_space.awk BANK=all pokecrystal.map -# No: tools/free_space.awk pokecrystal.map BANK=42 - -# Copyright (c) 2020, Eldred Habert. -# SPDX-License-Identifier: MIT - -BEGIN { - nb_banks = 0 - free = 0 - rom_bank = 0 # Safety net for malformed files - - # Default settings - # Variables assigned via the command-line (except through `-v`) are *after* `BEGIN` - BANK="none" -} - -# Only accept ROM banks, ignore everything else -toupper($0) ~ /^[ \t]*ROM[0X][ \t]+BANK[ \t]+#/ { - nb_banks++ - rom_bank = 1 - split($0, fields, /[ \t]/) - bank_num = strtonum(substr(fields[3], 2)) -} - -function register_bank(amount) { - free += amount - rom_bank = 0 # Reject upcoming banks by default - - if (BANK ~ /all/ || BANK == bank_num) { - printf "Bank %3d: %5d/16384 (%.2f%%)\n", bank_num, amount, amount * 100 / 16384 - } -} -function register_bank_str(str) { - if (str ~ /\$[0-9A-F]+/) { - register_bank(strtonum("0x" substr(str, 2))) - } else { - printf "Malformed number? \"%s\" does not start with '$'\n", str - } -} - -rom_bank && toupper($0) ~ /^[ \t]*EMPTY$/ { - # Empty bank - register_bank(16384) -} -rom_bank && toupper($0) ~ /^[ \t]*SLACK:[ \t]/ { - # Old (rgbds <=0.6.0) end-of-bank free space - register_bank_str($2) -} -rom_bank && toupper($0) ~ /^[ \t]*TOTAL EMPTY:[ \t]/ { - # New (rgbds >=0.6.1) total free space - register_bank_str($3) -} - -END { - # Determine number of banks, by rounding to upper power of 2 - total_banks = 2 # Smallest size is 2 banks - while (total_banks < nb_banks) { - total_banks *= 2 - } - - # RGBLINK omits "trailing" ROM banks, so fake them - bank_num = nb_banks - while (bank_num < total_banks) { - register_bank(16384) - bank_num++ - } - - total = total_banks * 16384 - printf "Free space: %5d/%5d (%.2f%%)\n", free, total, free * 100 / total -} diff --git a/tools/gbcpal.c b/tools/gbcpal.c new file mode 100644 index 00000000000..eb328463cb2 --- /dev/null +++ b/tools/gbcpal.c @@ -0,0 +1,136 @@ +#define PROGRAM_NAME "gbcpal" +#define USAGE_OPTS "[-h|--help] [-r|--reverse] out.gbcpal in.gbcpal..." + +#include "common.h" + +bool reverse; + +void parse_args(int argc, char *argv[]) { + struct option long_options[] = { + {"reverse", no_argument, 0, 'r'}, + {"help", no_argument, 0, 'h'}, + {0} + }; + for (int opt; (opt = getopt_long(argc, argv, "rh", long_options)) != -1;) { + switch (opt) { + case 'r': + reverse = true; + break; + case 'h': + usage_exit(0); + break; + default: + usage_exit(1); + } + } +} + +struct Color { + uint8_t r, g, b; +}; + +const struct Color BLACK = {0, 0, 0}; +const struct Color WHITE = {31, 31, 31}; + +uint16_t pack_color(struct Color color) { + return (color.b << 10) | (color.g << 5) | color.r; +} + +struct Color unpack_color(uint16_t gbc_color) { + return (struct Color){ + .r = gbc_color & 0x1f, + .g = (gbc_color >> 5) & 0x1f, + .b = (gbc_color >> 10) & 0x1f, + }; +} + +bool same_color(struct Color color1, struct Color color2) { + return color1.r == color2.r && color1.g == color2.g && color1.b == color2.b; +} + +double luminance(struct Color color) { + return 0.299 * color.r + 0.587 * color.g + 0.114 * color.b; +} + +int compare_luminance(const void *color1, const void *color2) { + double lum1 = luminance(*(const struct Color *)color1); + double lum2 = luminance(*(const struct Color *)color2); + // sort lightest to darkest, or darkest to lightest if reversed + return ((lum1 < lum2) - (lum1 > lum2)) * (reverse ? -1 : 1); +} + +void read_gbcpal(const char *filename, struct Color **colors, size_t *num_colors) { + long filesize; + uint8_t *bytes = read_u8(filename, &filesize); + if (filesize == 0) { + error_exit("%s: empty gbcpal file\n", filename); + } + if (filesize % 2) { + error_exit("%s: invalid gbcpal file\n", filename); + } + + size_t new_colors = filesize / 2; + *colors = xrealloc(*colors, (sizeof **colors) * (*num_colors + new_colors)); + for (size_t i = 0; i < new_colors; i++) { + uint16_t gbc_color = (bytes[i * 2 + 1] << 8) | bytes[i * 2]; + (*colors)[*num_colors + i] = unpack_color(gbc_color); + } + *num_colors += new_colors; + + free(bytes); +} + +void filter_colors(struct Color *colors, size_t *num_colors) { + size_t num_filtered = 0; + // filter out black, white, and duplicate colors + for (size_t i = 0; i < *num_colors; i++) { + struct Color color = colors[i]; + if (!same_color(color, BLACK) && !same_color(color, WHITE) && + (num_filtered == 0 || !same_color(color, colors[num_filtered - 1]))) { + colors[num_filtered++] = color; + } + } + *num_colors = num_filtered; +} + +int main(int argc, char *argv[]) { + parse_args(argc, argv); + + argc -= optind; + argv += optind; + if (argc < 2) { + usage_exit(1); + } + + const char *out_filename = argv[0]; + + struct Color *colors = NULL; + size_t num_colors = 0; + for (int i = 1; i < argc; i++) { + read_gbcpal(argv[i], &colors, &num_colors); + } + + qsort(colors, num_colors, sizeof(*colors), compare_luminance); + filter_colors(colors, &num_colors); + + struct Color pal_colors[4] = { + WHITE, + num_colors > 0 ? colors[0] : WHITE, + num_colors > 1 ? colors[1] : num_colors > 0 ? colors[0] : BLACK, + BLACK, + }; + if (num_colors > 2) { + error_exit("%s: more than 2 colors besides black and white (%zu)\n", out_filename, num_colors); + } + + uint8_t bytes[COUNTOF(pal_colors) * 2] = {0}; + for (size_t i = 0; i < COUNTOF(pal_colors); i++) { + uint16_t packed_color = pack_color(pal_colors[i]); + bytes[2 * i] = packed_color & 0xff; + bytes[2 * i + 1] = packed_color >> 8; + } + write_u8(out_filename, bytes, COUNTOF(bytes)); + + free(colors); + return 0; +} diff --git a/tools/lodepng/lodepng.c b/tools/lodepng/lodepng.c deleted file mode 100644 index 7e6ffded721..00000000000 --- a/tools/lodepng/lodepng.c +++ /dev/null @@ -1,6497 +0,0 @@ -/* -LodePNG version 20210627 - -Copyright (c) 2005-2021 Lode Vandevenne - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*/ - -/* -The manual and changelog are in the header file "lodepng.h" -Rename this file to lodepng.cpp to use it for C++, or to lodepng.c to use it for C. -*/ - -#include "lodepng.h" - -#ifdef LODEPNG_COMPILE_DISK -#include /* LONG_MAX */ -#include /* file handling */ -#endif /* LODEPNG_COMPILE_DISK */ - -#ifdef LODEPNG_COMPILE_ALLOCATORS -#include /* allocations */ -#endif /* LODEPNG_COMPILE_ALLOCATORS */ - -#if defined(_MSC_VER) && (_MSC_VER >= 1310) /*Visual Studio: A few warning types are not desired here.*/ -#pragma warning( disable : 4244 ) /*implicit conversions: not warned by gcc -Wall -Wextra and requires too much casts*/ -#pragma warning( disable : 4996 ) /*VS does not like fopen, but fopen_s is not standard C so unusable here*/ -#endif /*_MSC_VER */ - -const char* LODEPNG_VERSION_STRING = "20210627"; - -/* -This source file is built up in the following large parts. The code sections -with the "LODEPNG_COMPILE_" #defines divide this up further in an intermixed way. --Tools for C and common code for PNG and Zlib --C Code for Zlib (huffman, deflate, ...) --C Code for PNG (file format chunks, adam7, PNG filters, color conversions, ...) --The C++ wrapper around all of the above -*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* // Tools for C, and common code for PNG and Zlib. // */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/*The malloc, realloc and free functions defined here with "lodepng_" in front -of the name, so that you can easily change them to others related to your -platform if needed. Everything else in the code calls these. Pass --DLODEPNG_NO_COMPILE_ALLOCATORS to the compiler, or comment out -#define LODEPNG_COMPILE_ALLOCATORS in the header, to disable the ones here and -define them in your own project's source files without needing to change -lodepng source code. Don't forget to remove "static" if you copypaste them -from here.*/ - -#ifdef LODEPNG_COMPILE_ALLOCATORS -static void* lodepng_malloc(size_t size) { -#ifdef LODEPNG_MAX_ALLOC - if(size > LODEPNG_MAX_ALLOC) return 0; -#endif - return malloc(size); -} - -/* NOTE: when realloc returns NULL, it leaves the original memory untouched */ -static void* lodepng_realloc(void* ptr, size_t new_size) { -#ifdef LODEPNG_MAX_ALLOC - if(new_size > LODEPNG_MAX_ALLOC) return 0; -#endif - return realloc(ptr, new_size); -} - -static void lodepng_free(void* ptr) { - free(ptr); -} -#else /*LODEPNG_COMPILE_ALLOCATORS*/ -/* TODO: support giving additional void* payload to the custom allocators */ -void* lodepng_malloc(size_t size); -void* lodepng_realloc(void* ptr, size_t new_size); -void lodepng_free(void* ptr); -#endif /*LODEPNG_COMPILE_ALLOCATORS*/ - -/* convince the compiler to inline a function, for use when this measurably improves performance */ -/* inline is not available in C90, but use it when supported by the compiler */ -#if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || (defined(__cplusplus) && (__cplusplus >= 199711L)) -#define LODEPNG_INLINE inline -#else -#define LODEPNG_INLINE /* not available */ -#endif - -/* restrict is not available in C90, but use it when supported by the compiler */ -#if (defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))) ||\ - (defined(_MSC_VER) && (_MSC_VER >= 1400)) || \ - (defined(__WATCOMC__) && (__WATCOMC__ >= 1250) && !defined(__cplusplus)) -#define LODEPNG_RESTRICT __restrict -#else -#define LODEPNG_RESTRICT /* not available */ -#endif - -/* Replacements for C library functions such as memcpy and strlen, to support platforms -where a full C library is not available. The compiler can recognize them and compile -to something as fast. */ - -static void lodepng_memcpy(void* LODEPNG_RESTRICT dst, - const void* LODEPNG_RESTRICT src, size_t size) { - size_t i; - for(i = 0; i < size; i++) ((char*)dst)[i] = ((const char*)src)[i]; -} - -static void lodepng_memset(void* LODEPNG_RESTRICT dst, - int value, size_t num) { - size_t i; - for(i = 0; i < num; i++) ((char*)dst)[i] = (char)value; -} - -/* does not check memory out of bounds, do not use on untrusted data */ -static size_t lodepng_strlen(const char* a) { - const char* orig = a; - /* avoid warning about unused function in case of disabled COMPILE... macros */ - (void)(&lodepng_strlen); - while(*a) a++; - return (size_t)(a - orig); -} - -#define LODEPNG_MAX(a, b) (((a) > (b)) ? (a) : (b)) -#define LODEPNG_MIN(a, b) (((a) < (b)) ? (a) : (b)) -#define LODEPNG_ABS(x) ((x) < 0 ? -(x) : (x)) - -#if defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_DECODER) -/* Safely check if adding two integers will overflow (no undefined -behavior, compiler removing the code, etc...) and output result. */ -static int lodepng_addofl(size_t a, size_t b, size_t* result) { - *result = a + b; /* Unsigned addition is well defined and safe in C90 */ - return *result < a; -} -#endif /*defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_DECODER)*/ - -#ifdef LODEPNG_COMPILE_DECODER -/* Safely check if multiplying two integers will overflow (no undefined -behavior, compiler removing the code, etc...) and output result. */ -static int lodepng_mulofl(size_t a, size_t b, size_t* result) { - *result = a * b; /* Unsigned multiplication is well defined and safe in C90 */ - return (a != 0 && *result / a != b); -} - -#ifdef LODEPNG_COMPILE_ZLIB -/* Safely check if a + b > c, even if overflow could happen. */ -static int lodepng_gtofl(size_t a, size_t b, size_t c) { - size_t d; - if(lodepng_addofl(a, b, &d)) return 1; - return d > c; -} -#endif /*LODEPNG_COMPILE_ZLIB*/ -#endif /*LODEPNG_COMPILE_DECODER*/ - - -/* -Often in case of an error a value is assigned to a variable and then it breaks -out of a loop (to go to the cleanup phase of a function). This macro does that. -It makes the error handling code shorter and more readable. - -Example: if(!uivector_resize(&lz77_encoded, datasize)) ERROR_BREAK(83); -*/ -#define CERROR_BREAK(errorvar, code){\ - errorvar = code;\ - break;\ -} - -/*version of CERROR_BREAK that assumes the common case where the error variable is named "error"*/ -#define ERROR_BREAK(code) CERROR_BREAK(error, code) - -/*Set error var to the error code, and return it.*/ -#define CERROR_RETURN_ERROR(errorvar, code){\ - errorvar = code;\ - return code;\ -} - -/*Try the code, if it returns error, also return the error.*/ -#define CERROR_TRY_RETURN(call){\ - unsigned error = call;\ - if(error) return error;\ -} - -/*Set error var to the error code, and return from the void function.*/ -#define CERROR_RETURN(errorvar, code){\ - errorvar = code;\ - return;\ -} - -/* -About uivector, ucvector and string: --All of them wrap dynamic arrays or text strings in a similar way. --LodePNG was originally written in C++. The vectors replace the std::vectors that were used in the C++ version. --The string tools are made to avoid problems with compilers that declare things like strncat as deprecated. --They're not used in the interface, only internally in this file as static functions. --As with many other structs in this file, the init and cleanup functions serve as ctor and dtor. -*/ - -#ifdef LODEPNG_COMPILE_ZLIB -#ifdef LODEPNG_COMPILE_ENCODER -/*dynamic vector of unsigned ints*/ -typedef struct uivector { - unsigned* data; - size_t size; /*size in number of unsigned longs*/ - size_t allocsize; /*allocated size in bytes*/ -} uivector; - -static void uivector_cleanup(void* p) { - ((uivector*)p)->size = ((uivector*)p)->allocsize = 0; - lodepng_free(((uivector*)p)->data); - ((uivector*)p)->data = NULL; -} - -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned uivector_resize(uivector* p, size_t size) { - size_t allocsize = size * sizeof(unsigned); - if(allocsize > p->allocsize) { - size_t newsize = allocsize + (p->allocsize >> 1u); - void* data = lodepng_realloc(p->data, newsize); - if(data) { - p->allocsize = newsize; - p->data = (unsigned*)data; - } - else return 0; /*error: not enough memory*/ - } - p->size = size; - return 1; /*success*/ -} - -static void uivector_init(uivector* p) { - p->data = NULL; - p->size = p->allocsize = 0; -} - -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned uivector_push_back(uivector* p, unsigned c) { - if(!uivector_resize(p, p->size + 1)) return 0; - p->data[p->size - 1] = c; - return 1; -} -#endif /*LODEPNG_COMPILE_ENCODER*/ -#endif /*LODEPNG_COMPILE_ZLIB*/ - -/* /////////////////////////////////////////////////////////////////////////// */ - -/*dynamic vector of unsigned chars*/ -typedef struct ucvector { - unsigned char* data; - size_t size; /*used size*/ - size_t allocsize; /*allocated size*/ -} ucvector; - -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned ucvector_resize(ucvector* p, size_t size) { - if(size > p->allocsize) { - size_t newsize = size + (p->allocsize >> 1u); - void* data = lodepng_realloc(p->data, newsize); - if(data) { - p->allocsize = newsize; - p->data = (unsigned char*)data; - } - else return 0; /*error: not enough memory*/ - } - p->size = size; - return 1; /*success*/ -} - -static ucvector ucvector_init(unsigned char* buffer, size_t size) { - ucvector v; - v.data = buffer; - v.allocsize = v.size = size; - return v; -} - -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_PNG -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - -/*free string pointer and set it to NULL*/ -static void string_cleanup(char** out) { - lodepng_free(*out); - *out = NULL; -} - -/*also appends null termination character*/ -static char* alloc_string_sized(const char* in, size_t insize) { - char* out = (char*)lodepng_malloc(insize + 1); - if(out) { - lodepng_memcpy(out, in, insize); - out[insize] = 0; - } - return out; -} - -/* dynamically allocates a new string with a copy of the null terminated input text */ -static char* alloc_string(const char* in) { - return alloc_string_sized(in, lodepng_strlen(in)); -} -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -#endif /*LODEPNG_COMPILE_PNG*/ - -/* ////////////////////////////////////////////////////////////////////////// */ - -#if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_PNG) -static unsigned lodepng_read32bitInt(const unsigned char* buffer) { - return (((unsigned)buffer[0] << 24u) | ((unsigned)buffer[1] << 16u) | - ((unsigned)buffer[2] << 8u) | (unsigned)buffer[3]); -} -#endif /*defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_PNG)*/ - -#if defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER) -/*buffer must have at least 4 allocated bytes available*/ -static void lodepng_set32bitInt(unsigned char* buffer, unsigned value) { - buffer[0] = (unsigned char)((value >> 24) & 0xff); - buffer[1] = (unsigned char)((value >> 16) & 0xff); - buffer[2] = (unsigned char)((value >> 8) & 0xff); - buffer[3] = (unsigned char)((value ) & 0xff); -} -#endif /*defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER)*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / File IO / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_DISK - -/* returns negative value on error. This should be pure C compatible, so no fstat. */ -static long lodepng_filesize(const char* filename) { - FILE* file; - long size; - file = fopen(filename, "rb"); - if(!file) return -1; - - if(fseek(file, 0, SEEK_END) != 0) { - fclose(file); - return -1; - } - - size = ftell(file); - /* It may give LONG_MAX as directory size, this is invalid for us. */ - if(size == LONG_MAX) size = -1; - - fclose(file); - return size; -} - -/* load file into buffer that already has the correct allocated size. Returns error code.*/ -static unsigned lodepng_buffer_file(unsigned char* out, size_t size, const char* filename) { - FILE* file; - size_t readsize; - file = fopen(filename, "rb"); - if(!file) return 78; - - readsize = fread(out, 1, size, file); - fclose(file); - - if(readsize != size) return 78; - return 0; -} - -unsigned lodepng_load_file(unsigned char** out, size_t* outsize, const char* filename) { - long size = lodepng_filesize(filename); - if(size < 0) return 78; - *outsize = (size_t)size; - - *out = (unsigned char*)lodepng_malloc((size_t)size); - if(!(*out) && size > 0) return 83; /*the above malloc failed*/ - - return lodepng_buffer_file(*out, (size_t)size, filename); -} - -/*write given buffer to the file, overwriting the file, it doesn't append to it.*/ -unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const char* filename) { - FILE* file; - file = fopen(filename, "wb" ); - if(!file) return 79; - fwrite(buffer, 1, buffersize, file); - fclose(file); - return 0; -} - -#endif /*LODEPNG_COMPILE_DISK*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* // End of common code and tools. Begin of Zlib related code. // */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_ZLIB -#ifdef LODEPNG_COMPILE_ENCODER - -typedef struct { - ucvector* data; - unsigned char bp; /*ok to overflow, indicates bit pos inside byte*/ -} LodePNGBitWriter; - -static void LodePNGBitWriter_init(LodePNGBitWriter* writer, ucvector* data) { - writer->data = data; - writer->bp = 0; -} - -/*TODO: this ignores potential out of memory errors*/ -#define WRITEBIT(writer, bit){\ - /* append new byte */\ - if(((writer->bp) & 7u) == 0) {\ - if(!ucvector_resize(writer->data, writer->data->size + 1)) return;\ - writer->data->data[writer->data->size - 1] = 0;\ - }\ - (writer->data->data[writer->data->size - 1]) |= (bit << ((writer->bp) & 7u));\ - ++writer->bp;\ -} - -/* LSB of value is written first, and LSB of bytes is used first */ -static void writeBits(LodePNGBitWriter* writer, unsigned value, size_t nbits) { - if(nbits == 1) { /* compiler should statically compile this case if nbits == 1 */ - WRITEBIT(writer, value); - } else { - /* TODO: increase output size only once here rather than in each WRITEBIT */ - size_t i; - for(i = 0; i != nbits; ++i) { - WRITEBIT(writer, (unsigned char)((value >> i) & 1)); - } - } -} - -/* This one is to use for adding huffman symbol, the value bits are written MSB first */ -static void writeBitsReversed(LodePNGBitWriter* writer, unsigned value, size_t nbits) { - size_t i; - for(i = 0; i != nbits; ++i) { - /* TODO: increase output size only once here rather than in each WRITEBIT */ - WRITEBIT(writer, (unsigned char)((value >> (nbits - 1u - i)) & 1u)); - } -} -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#ifdef LODEPNG_COMPILE_DECODER - -typedef struct { - const unsigned char* data; - size_t size; /*size of data in bytes*/ - size_t bitsize; /*size of data in bits, end of valid bp values, should be 8*size*/ - size_t bp; - unsigned buffer; /*buffer for reading bits. NOTE: 'unsigned' must support at least 32 bits*/ -} LodePNGBitReader; - -/* data size argument is in bytes. Returns error if size too large causing overflow */ -static unsigned LodePNGBitReader_init(LodePNGBitReader* reader, const unsigned char* data, size_t size) { - size_t temp; - reader->data = data; - reader->size = size; - /* size in bits, return error if overflow (if size_t is 32 bit this supports up to 500MB) */ - if(lodepng_mulofl(size, 8u, &reader->bitsize)) return 105; - /*ensure incremented bp can be compared to bitsize without overflow even when it would be incremented 32 too much and - trying to ensure 32 more bits*/ - if(lodepng_addofl(reader->bitsize, 64u, &temp)) return 105; - reader->bp = 0; - reader->buffer = 0; - return 0; /*ok*/ -} - -/* -ensureBits functions: -Ensures the reader can at least read nbits bits in one or more readBits calls, -safely even if not enough bits are available. -Returns 1 if there are enough bits available, 0 if not. -*/ - -/*See ensureBits documentation above. This one ensures exactly 1 bit */ -/*static unsigned ensureBits1(LodePNGBitReader* reader) { - if(reader->bp >= reader->bitsize) return 0; - reader->buffer = (unsigned)reader->data[reader->bp >> 3u] >> (reader->bp & 7u); - return 1; -}*/ - -/*See ensureBits documentation above. This one ensures up to 9 bits */ -static unsigned ensureBits9(LodePNGBitReader* reader, size_t nbits) { - size_t start = reader->bp >> 3u; - size_t size = reader->size; - if(start + 1u < size) { - reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u); - reader->buffer >>= (reader->bp & 7u); - return 1; - } else { - reader->buffer = 0; - if(start + 0u < size) reader->buffer |= reader->data[start + 0]; - reader->buffer >>= (reader->bp & 7u); - return reader->bp + nbits <= reader->bitsize; - } -} - -/*See ensureBits documentation above. This one ensures up to 17 bits */ -static unsigned ensureBits17(LodePNGBitReader* reader, size_t nbits) { - size_t start = reader->bp >> 3u; - size_t size = reader->size; - if(start + 2u < size) { - reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) | - ((unsigned)reader->data[start + 2] << 16u); - reader->buffer >>= (reader->bp & 7u); - return 1; - } else { - reader->buffer = 0; - if(start + 0u < size) reader->buffer |= reader->data[start + 0]; - if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); - reader->buffer >>= (reader->bp & 7u); - return reader->bp + nbits <= reader->bitsize; - } -} - -/*See ensureBits documentation above. This one ensures up to 25 bits */ -static LODEPNG_INLINE unsigned ensureBits25(LodePNGBitReader* reader, size_t nbits) { - size_t start = reader->bp >> 3u; - size_t size = reader->size; - if(start + 3u < size) { - reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) | - ((unsigned)reader->data[start + 2] << 16u) | ((unsigned)reader->data[start + 3] << 24u); - reader->buffer >>= (reader->bp & 7u); - return 1; - } else { - reader->buffer = 0; - if(start + 0u < size) reader->buffer |= reader->data[start + 0]; - if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); - if(start + 2u < size) reader->buffer |= ((unsigned)reader->data[start + 2] << 16u); - reader->buffer >>= (reader->bp & 7u); - return reader->bp + nbits <= reader->bitsize; - } -} - -/*See ensureBits documentation above. This one ensures up to 32 bits */ -static LODEPNG_INLINE unsigned ensureBits32(LodePNGBitReader* reader, size_t nbits) { - size_t start = reader->bp >> 3u; - size_t size = reader->size; - if(start + 4u < size) { - reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) | - ((unsigned)reader->data[start + 2] << 16u) | ((unsigned)reader->data[start + 3] << 24u); - reader->buffer >>= (reader->bp & 7u); - reader->buffer |= (((unsigned)reader->data[start + 4] << 24u) << (8u - (reader->bp & 7u))); - return 1; - } else { - reader->buffer = 0; - if(start + 0u < size) reader->buffer |= reader->data[start + 0]; - if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); - if(start + 2u < size) reader->buffer |= ((unsigned)reader->data[start + 2] << 16u); - if(start + 3u < size) reader->buffer |= ((unsigned)reader->data[start + 3] << 24u); - reader->buffer >>= (reader->bp & 7u); - return reader->bp + nbits <= reader->bitsize; - } -} - -/* Get bits without advancing the bit pointer. Must have enough bits available with ensureBits. Max nbits is 31. */ -static unsigned peekBits(LodePNGBitReader* reader, size_t nbits) { - /* The shift allows nbits to be only up to 31. */ - return reader->buffer & ((1u << nbits) - 1u); -} - -/* Must have enough bits available with ensureBits */ -static void advanceBits(LodePNGBitReader* reader, size_t nbits) { - reader->buffer >>= nbits; - reader->bp += nbits; -} - -/* Must have enough bits available with ensureBits */ -static unsigned readBits(LodePNGBitReader* reader, size_t nbits) { - unsigned result = peekBits(reader, nbits); - advanceBits(reader, nbits); - return result; -} - -/* Public for testing only. steps and result must have numsteps values. */ -unsigned lode_png_test_bitreader(const unsigned char* data, size_t size, - size_t numsteps, const size_t* steps, unsigned* result) { - size_t i; - LodePNGBitReader reader; - unsigned error = LodePNGBitReader_init(&reader, data, size); - if(error) return 0; - for(i = 0; i < numsteps; i++) { - size_t step = steps[i]; - unsigned ok; - if(step > 25) ok = ensureBits32(&reader, step); - else if(step > 17) ok = ensureBits25(&reader, step); - else if(step > 9) ok = ensureBits17(&reader, step); - else ok = ensureBits9(&reader, step); - if(!ok) return 0; - result[i] = readBits(&reader, step); - } - return 1; -} -#endif /*LODEPNG_COMPILE_DECODER*/ - -static unsigned reverseBits(unsigned bits, unsigned num) { - /*TODO: implement faster lookup table based version when needed*/ - unsigned i, result = 0; - for(i = 0; i < num; i++) result |= ((bits >> (num - i - 1u)) & 1u) << i; - return result; -} - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Deflate - Huffman / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#define FIRST_LENGTH_CODE_INDEX 257 -#define LAST_LENGTH_CODE_INDEX 285 -/*256 literals, the end code, some length codes, and 2 unused codes*/ -#define NUM_DEFLATE_CODE_SYMBOLS 288 -/*the distance codes have their own symbols, 30 used, 2 unused*/ -#define NUM_DISTANCE_SYMBOLS 32 -/*the code length codes. 0-15: code lengths, 16: copy previous 3-6 times, 17: 3-10 zeros, 18: 11-138 zeros*/ -#define NUM_CODE_LENGTH_CODES 19 - -/*the base lengths represented by codes 257-285*/ -static const unsigned LENGTHBASE[29] - = {3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, - 67, 83, 99, 115, 131, 163, 195, 227, 258}; - -/*the extra bits used by codes 257-285 (added to base length)*/ -static const unsigned LENGTHEXTRA[29] - = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, - 4, 4, 4, 4, 5, 5, 5, 5, 0}; - -/*the base backwards distances (the bits of distance codes appear after length codes and use their own huffman tree)*/ -static const unsigned DISTANCEBASE[30] - = {1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, - 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577}; - -/*the extra bits of backwards distances (added to base)*/ -static const unsigned DISTANCEEXTRA[30] - = {0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, - 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13}; - -/*the order in which "code length alphabet code lengths" are stored as specified by deflate, out of this the huffman -tree of the dynamic huffman tree lengths is generated*/ -static const unsigned CLCL_ORDER[NUM_CODE_LENGTH_CODES] - = {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - -/* ////////////////////////////////////////////////////////////////////////// */ - -/* -Huffman tree struct, containing multiple representations of the tree -*/ -typedef struct HuffmanTree { - unsigned* codes; /*the huffman codes (bit patterns representing the symbols)*/ - unsigned* lengths; /*the lengths of the huffman codes*/ - unsigned maxbitlen; /*maximum number of bits a single code can get*/ - unsigned numcodes; /*number of symbols in the alphabet = number of codes*/ - /* for reading only */ - unsigned char* table_len; /*length of symbol from lookup table, or max length if secondary lookup needed*/ - unsigned short* table_value; /*value of symbol from lookup table, or pointer to secondary table if needed*/ -} HuffmanTree; - -static void HuffmanTree_init(HuffmanTree* tree) { - tree->codes = 0; - tree->lengths = 0; - tree->table_len = 0; - tree->table_value = 0; -} - -static void HuffmanTree_cleanup(HuffmanTree* tree) { - lodepng_free(tree->codes); - lodepng_free(tree->lengths); - lodepng_free(tree->table_len); - lodepng_free(tree->table_value); -} - -/* amount of bits for first huffman table lookup (aka root bits), see HuffmanTree_makeTable and huffmanDecodeSymbol.*/ -/* values 8u and 9u work the fastest */ -#define FIRSTBITS 9u - -/* a symbol value too big to represent any valid symbol, to indicate reading disallowed huffman bits combination, -which is possible in case of only 0 or 1 present symbols. */ -#define INVALIDSYMBOL 65535u - -/* make table for huffman decoding */ -static unsigned HuffmanTree_makeTable(HuffmanTree* tree) { - static const unsigned headsize = 1u << FIRSTBITS; /*size of the first table*/ - static const unsigned mask = (1u << FIRSTBITS) /*headsize*/ - 1u; - size_t i, numpresent, pointer, size; /*total table size*/ - unsigned* maxlens = (unsigned*)lodepng_malloc(headsize * sizeof(unsigned)); - if(!maxlens) return 83; /*alloc fail*/ - - /* compute maxlens: max total bit length of symbols sharing prefix in the first table*/ - lodepng_memset(maxlens, 0, headsize * sizeof(*maxlens)); - for(i = 0; i < tree->numcodes; i++) { - unsigned symbol = tree->codes[i]; - unsigned l = tree->lengths[i]; - unsigned index; - if(l <= FIRSTBITS) continue; /*symbols that fit in first table don't increase secondary table size*/ - /*get the FIRSTBITS MSBs, the MSBs of the symbol are encoded first. See later comment about the reversing*/ - index = reverseBits(symbol >> (l - FIRSTBITS), FIRSTBITS); - maxlens[index] = LODEPNG_MAX(maxlens[index], l); - } - /* compute total table size: size of first table plus all secondary tables for symbols longer than FIRSTBITS */ - size = headsize; - for(i = 0; i < headsize; ++i) { - unsigned l = maxlens[i]; - if(l > FIRSTBITS) size += (1u << (l - FIRSTBITS)); - } - tree->table_len = (unsigned char*)lodepng_malloc(size * sizeof(*tree->table_len)); - tree->table_value = (unsigned short*)lodepng_malloc(size * sizeof(*tree->table_value)); - if(!tree->table_len || !tree->table_value) { - lodepng_free(maxlens); - /* freeing tree->table values is done at a higher scope */ - return 83; /*alloc fail*/ - } - /*initialize with an invalid length to indicate unused entries*/ - for(i = 0; i < size; ++i) tree->table_len[i] = 16; - - /*fill in the first table for long symbols: max prefix size and pointer to secondary tables*/ - pointer = headsize; - for(i = 0; i < headsize; ++i) { - unsigned l = maxlens[i]; - if(l <= FIRSTBITS) continue; - tree->table_len[i] = l; - tree->table_value[i] = pointer; - pointer += (1u << (l - FIRSTBITS)); - } - lodepng_free(maxlens); - - /*fill in the first table for short symbols, or secondary table for long symbols*/ - numpresent = 0; - for(i = 0; i < tree->numcodes; ++i) { - unsigned l = tree->lengths[i]; - unsigned symbol = tree->codes[i]; /*the huffman bit pattern. i itself is the value.*/ - /*reverse bits, because the huffman bits are given in MSB first order but the bit reader reads LSB first*/ - unsigned reverse = reverseBits(symbol, l); - if(l == 0) continue; - numpresent++; - - if(l <= FIRSTBITS) { - /*short symbol, fully in first table, replicated num times if l < FIRSTBITS*/ - unsigned num = 1u << (FIRSTBITS - l); - unsigned j; - for(j = 0; j < num; ++j) { - /*bit reader will read the l bits of symbol first, the remaining FIRSTBITS - l bits go to the MSB's*/ - unsigned index = reverse | (j << l); - if(tree->table_len[index] != 16) return 55; /*invalid tree: long symbol shares prefix with short symbol*/ - tree->table_len[index] = l; - tree->table_value[index] = i; - } - } else { - /*long symbol, shares prefix with other long symbols in first lookup table, needs second lookup*/ - /*the FIRSTBITS MSBs of the symbol are the first table index*/ - unsigned index = reverse & mask; - unsigned maxlen = tree->table_len[index]; - /*log2 of secondary table length, should be >= l - FIRSTBITS*/ - unsigned tablelen = maxlen - FIRSTBITS; - unsigned start = tree->table_value[index]; /*starting index in secondary table*/ - unsigned num = 1u << (tablelen - (l - FIRSTBITS)); /*amount of entries of this symbol in secondary table*/ - unsigned j; - if(maxlen < l) return 55; /*invalid tree: long symbol shares prefix with short symbol*/ - for(j = 0; j < num; ++j) { - unsigned reverse2 = reverse >> FIRSTBITS; /* l - FIRSTBITS bits */ - unsigned index2 = start + (reverse2 | (j << (l - FIRSTBITS))); - tree->table_len[index2] = l; - tree->table_value[index2] = i; - } - } - } - - if(numpresent < 2) { - /* In case of exactly 1 symbol, in theory the huffman symbol needs 0 bits, - but deflate uses 1 bit instead. In case of 0 symbols, no symbols can - appear at all, but such huffman tree could still exist (e.g. if distance - codes are never used). In both cases, not all symbols of the table will be - filled in. Fill them in with an invalid symbol value so returning them from - huffmanDecodeSymbol will cause error. */ - for(i = 0; i < size; ++i) { - if(tree->table_len[i] == 16) { - /* As length, use a value smaller than FIRSTBITS for the head table, - and a value larger than FIRSTBITS for the secondary table, to ensure - valid behavior for advanceBits when reading this symbol. */ - tree->table_len[i] = (i < headsize) ? 1 : (FIRSTBITS + 1); - tree->table_value[i] = INVALIDSYMBOL; - } - } - } else { - /* A good huffman tree has N * 2 - 1 nodes, of which N - 1 are internal nodes. - If that is not the case (due to too long length codes), the table will not - have been fully used, and this is an error (not all bit combinations can be - decoded): an oversubscribed huffman tree, indicated by error 55. */ - for(i = 0; i < size; ++i) { - if(tree->table_len[i] == 16) return 55; - } - } - - return 0; -} - -/* -Second step for the ...makeFromLengths and ...makeFromFrequencies functions. -numcodes, lengths and maxbitlen must already be filled in correctly. return -value is error. -*/ -static unsigned HuffmanTree_makeFromLengths2(HuffmanTree* tree) { - unsigned* blcount; - unsigned* nextcode; - unsigned error = 0; - unsigned bits, n; - - tree->codes = (unsigned*)lodepng_malloc(tree->numcodes * sizeof(unsigned)); - blcount = (unsigned*)lodepng_malloc((tree->maxbitlen + 1) * sizeof(unsigned)); - nextcode = (unsigned*)lodepng_malloc((tree->maxbitlen + 1) * sizeof(unsigned)); - if(!tree->codes || !blcount || !nextcode) error = 83; /*alloc fail*/ - - if(!error) { - for(n = 0; n != tree->maxbitlen + 1; n++) blcount[n] = nextcode[n] = 0; - /*step 1: count number of instances of each code length*/ - for(bits = 0; bits != tree->numcodes; ++bits) ++blcount[tree->lengths[bits]]; - /*step 2: generate the nextcode values*/ - for(bits = 1; bits <= tree->maxbitlen; ++bits) { - nextcode[bits] = (nextcode[bits - 1] + blcount[bits - 1]) << 1u; - } - /*step 3: generate all the codes*/ - for(n = 0; n != tree->numcodes; ++n) { - if(tree->lengths[n] != 0) { - tree->codes[n] = nextcode[tree->lengths[n]]++; - /*remove superfluous bits from the code*/ - tree->codes[n] &= ((1u << tree->lengths[n]) - 1u); - } - } - } - - lodepng_free(blcount); - lodepng_free(nextcode); - - if(!error) error = HuffmanTree_makeTable(tree); - return error; -} - -/* -given the code lengths (as stored in the PNG file), generate the tree as defined -by Deflate. maxbitlen is the maximum bits that a code in the tree can have. -return value is error. -*/ -static unsigned HuffmanTree_makeFromLengths(HuffmanTree* tree, const unsigned* bitlen, - size_t numcodes, unsigned maxbitlen) { - unsigned i; - tree->lengths = (unsigned*)lodepng_malloc(numcodes * sizeof(unsigned)); - if(!tree->lengths) return 83; /*alloc fail*/ - for(i = 0; i != numcodes; ++i) tree->lengths[i] = bitlen[i]; - tree->numcodes = (unsigned)numcodes; /*number of symbols*/ - tree->maxbitlen = maxbitlen; - return HuffmanTree_makeFromLengths2(tree); -} - -#ifdef LODEPNG_COMPILE_ENCODER - -/*BPM: Boundary Package Merge, see "A Fast and Space-Economical Algorithm for Length-Limited Coding", -Jyrki Katajainen, Alistair Moffat, Andrew Turpin, 1995.*/ - -/*chain node for boundary package merge*/ -typedef struct BPMNode { - int weight; /*the sum of all weights in this chain*/ - unsigned index; /*index of this leaf node (called "count" in the paper)*/ - struct BPMNode* tail; /*the next nodes in this chain (null if last)*/ - int in_use; -} BPMNode; - -/*lists of chains*/ -typedef struct BPMLists { - /*memory pool*/ - unsigned memsize; - BPMNode* memory; - unsigned numfree; - unsigned nextfree; - BPMNode** freelist; - /*two heads of lookahead chains per list*/ - unsigned listsize; - BPMNode** chains0; - BPMNode** chains1; -} BPMLists; - -/*creates a new chain node with the given parameters, from the memory in the lists */ -static BPMNode* bpmnode_create(BPMLists* lists, int weight, unsigned index, BPMNode* tail) { - unsigned i; - BPMNode* result; - - /*memory full, so garbage collect*/ - if(lists->nextfree >= lists->numfree) { - /*mark only those that are in use*/ - for(i = 0; i != lists->memsize; ++i) lists->memory[i].in_use = 0; - for(i = 0; i != lists->listsize; ++i) { - BPMNode* node; - for(node = lists->chains0[i]; node != 0; node = node->tail) node->in_use = 1; - for(node = lists->chains1[i]; node != 0; node = node->tail) node->in_use = 1; - } - /*collect those that are free*/ - lists->numfree = 0; - for(i = 0; i != lists->memsize; ++i) { - if(!lists->memory[i].in_use) lists->freelist[lists->numfree++] = &lists->memory[i]; - } - lists->nextfree = 0; - } - - result = lists->freelist[lists->nextfree++]; - result->weight = weight; - result->index = index; - result->tail = tail; - return result; -} - -/*sort the leaves with stable mergesort*/ -static void bpmnode_sort(BPMNode* leaves, size_t num) { - BPMNode* mem = (BPMNode*)lodepng_malloc(sizeof(*leaves) * num); - size_t width, counter = 0; - for(width = 1; width < num; width *= 2) { - BPMNode* a = (counter & 1) ? mem : leaves; - BPMNode* b = (counter & 1) ? leaves : mem; - size_t p; - for(p = 0; p < num; p += 2 * width) { - size_t q = (p + width > num) ? num : (p + width); - size_t r = (p + 2 * width > num) ? num : (p + 2 * width); - size_t i = p, j = q, k; - for(k = p; k < r; k++) { - if(i < q && (j >= r || a[i].weight <= a[j].weight)) b[k] = a[i++]; - else b[k] = a[j++]; - } - } - counter++; - } - if(counter & 1) lodepng_memcpy(leaves, mem, sizeof(*leaves) * num); - lodepng_free(mem); -} - -/*Boundary Package Merge step, numpresent is the amount of leaves, and c is the current chain.*/ -static void boundaryPM(BPMLists* lists, BPMNode* leaves, size_t numpresent, int c, int num) { - unsigned lastindex = lists->chains1[c]->index; - - if(c == 0) { - if(lastindex >= numpresent) return; - lists->chains0[c] = lists->chains1[c]; - lists->chains1[c] = bpmnode_create(lists, leaves[lastindex].weight, lastindex + 1, 0); - } else { - /*sum of the weights of the head nodes of the previous lookahead chains.*/ - int sum = lists->chains0[c - 1]->weight + lists->chains1[c - 1]->weight; - lists->chains0[c] = lists->chains1[c]; - if(lastindex < numpresent && sum > leaves[lastindex].weight) { - lists->chains1[c] = bpmnode_create(lists, leaves[lastindex].weight, lastindex + 1, lists->chains1[c]->tail); - return; - } - lists->chains1[c] = bpmnode_create(lists, sum, lastindex, lists->chains1[c - 1]); - /*in the end we are only interested in the chain of the last list, so no - need to recurse if we're at the last one (this gives measurable speedup)*/ - if(num + 1 < (int)(2 * numpresent - 2)) { - boundaryPM(lists, leaves, numpresent, c - 1, num); - boundaryPM(lists, leaves, numpresent, c - 1, num); - } - } -} - -unsigned lodepng_huffman_code_lengths(unsigned* lengths, const unsigned* frequencies, - size_t numcodes, unsigned maxbitlen) { - unsigned error = 0; - unsigned i; - size_t numpresent = 0; /*number of symbols with non-zero frequency*/ - BPMNode* leaves; /*the symbols, only those with > 0 frequency*/ - - if(numcodes == 0) return 80; /*error: a tree of 0 symbols is not supposed to be made*/ - if((1u << maxbitlen) < (unsigned)numcodes) return 80; /*error: represent all symbols*/ - - leaves = (BPMNode*)lodepng_malloc(numcodes * sizeof(*leaves)); - if(!leaves) return 83; /*alloc fail*/ - - for(i = 0; i != numcodes; ++i) { - if(frequencies[i] > 0) { - leaves[numpresent].weight = (int)frequencies[i]; - leaves[numpresent].index = i; - ++numpresent; - } - } - - lodepng_memset(lengths, 0, numcodes * sizeof(*lengths)); - - /*ensure at least two present symbols. There should be at least one symbol - according to RFC 1951 section 3.2.7. Some decoders incorrectly require two. To - make these work as well ensure there are at least two symbols. The - Package-Merge code below also doesn't work correctly if there's only one - symbol, it'd give it the theoretical 0 bits but in practice zlib wants 1 bit*/ - if(numpresent == 0) { - lengths[0] = lengths[1] = 1; /*note that for RFC 1951 section 3.2.7, only lengths[0] = 1 is needed*/ - } else if(numpresent == 1) { - lengths[leaves[0].index] = 1; - lengths[leaves[0].index == 0 ? 1 : 0] = 1; - } else { - BPMLists lists; - BPMNode* node; - - bpmnode_sort(leaves, numpresent); - - lists.listsize = maxbitlen; - lists.memsize = 2 * maxbitlen * (maxbitlen + 1); - lists.nextfree = 0; - lists.numfree = lists.memsize; - lists.memory = (BPMNode*)lodepng_malloc(lists.memsize * sizeof(*lists.memory)); - lists.freelist = (BPMNode**)lodepng_malloc(lists.memsize * sizeof(BPMNode*)); - lists.chains0 = (BPMNode**)lodepng_malloc(lists.listsize * sizeof(BPMNode*)); - lists.chains1 = (BPMNode**)lodepng_malloc(lists.listsize * sizeof(BPMNode*)); - if(!lists.memory || !lists.freelist || !lists.chains0 || !lists.chains1) error = 83; /*alloc fail*/ - - if(!error) { - for(i = 0; i != lists.memsize; ++i) lists.freelist[i] = &lists.memory[i]; - - bpmnode_create(&lists, leaves[0].weight, 1, 0); - bpmnode_create(&lists, leaves[1].weight, 2, 0); - - for(i = 0; i != lists.listsize; ++i) { - lists.chains0[i] = &lists.memory[0]; - lists.chains1[i] = &lists.memory[1]; - } - - /*each boundaryPM call adds one chain to the last list, and we need 2 * numpresent - 2 chains.*/ - for(i = 2; i != 2 * numpresent - 2; ++i) boundaryPM(&lists, leaves, numpresent, (int)maxbitlen - 1, (int)i); - - for(node = lists.chains1[maxbitlen - 1]; node; node = node->tail) { - for(i = 0; i != node->index; ++i) ++lengths[leaves[i].index]; - } - } - - lodepng_free(lists.memory); - lodepng_free(lists.freelist); - lodepng_free(lists.chains0); - lodepng_free(lists.chains1); - } - - lodepng_free(leaves); - return error; -} - -/*Create the Huffman tree given the symbol frequencies*/ -static unsigned HuffmanTree_makeFromFrequencies(HuffmanTree* tree, const unsigned* frequencies, - size_t mincodes, size_t numcodes, unsigned maxbitlen) { - unsigned error = 0; - while(!frequencies[numcodes - 1] && numcodes > mincodes) --numcodes; /*trim zeroes*/ - tree->lengths = (unsigned*)lodepng_malloc(numcodes * sizeof(unsigned)); - if(!tree->lengths) return 83; /*alloc fail*/ - tree->maxbitlen = maxbitlen; - tree->numcodes = (unsigned)numcodes; /*number of symbols*/ - - error = lodepng_huffman_code_lengths(tree->lengths, frequencies, numcodes, maxbitlen); - if(!error) error = HuffmanTree_makeFromLengths2(tree); - return error; -} -#endif /*LODEPNG_COMPILE_ENCODER*/ - -/*get the literal and length code tree of a deflated block with fixed tree, as per the deflate specification*/ -static unsigned generateFixedLitLenTree(HuffmanTree* tree) { - unsigned i, error = 0; - unsigned* bitlen = (unsigned*)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned)); - if(!bitlen) return 83; /*alloc fail*/ - - /*288 possible codes: 0-255=literals, 256=endcode, 257-285=lengthcodes, 286-287=unused*/ - for(i = 0; i <= 143; ++i) bitlen[i] = 8; - for(i = 144; i <= 255; ++i) bitlen[i] = 9; - for(i = 256; i <= 279; ++i) bitlen[i] = 7; - for(i = 280; i <= 287; ++i) bitlen[i] = 8; - - error = HuffmanTree_makeFromLengths(tree, bitlen, NUM_DEFLATE_CODE_SYMBOLS, 15); - - lodepng_free(bitlen); - return error; -} - -/*get the distance code tree of a deflated block with fixed tree, as specified in the deflate specification*/ -static unsigned generateFixedDistanceTree(HuffmanTree* tree) { - unsigned i, error = 0; - unsigned* bitlen = (unsigned*)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned)); - if(!bitlen) return 83; /*alloc fail*/ - - /*there are 32 distance codes, but 30-31 are unused*/ - for(i = 0; i != NUM_DISTANCE_SYMBOLS; ++i) bitlen[i] = 5; - error = HuffmanTree_makeFromLengths(tree, bitlen, NUM_DISTANCE_SYMBOLS, 15); - - lodepng_free(bitlen); - return error; -} - -#ifdef LODEPNG_COMPILE_DECODER - -/* -returns the code. The bit reader must already have been ensured at least 15 bits -*/ -static unsigned huffmanDecodeSymbol(LodePNGBitReader* reader, const HuffmanTree* codetree) { - unsigned short code = peekBits(reader, FIRSTBITS); - unsigned short l = codetree->table_len[code]; - unsigned short value = codetree->table_value[code]; - if(l <= FIRSTBITS) { - advanceBits(reader, l); - return value; - } else { - unsigned index2; - advanceBits(reader, FIRSTBITS); - index2 = value + peekBits(reader, l - FIRSTBITS); - advanceBits(reader, codetree->table_len[index2] - FIRSTBITS); - return codetree->table_value[index2]; - } -} -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_DECODER - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Inflator (Decompressor) / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/*get the tree of a deflated block with fixed tree, as specified in the deflate specification -Returns error code.*/ -static unsigned getTreeInflateFixed(HuffmanTree* tree_ll, HuffmanTree* tree_d) { - unsigned error = generateFixedLitLenTree(tree_ll); - if(error) return error; - return generateFixedDistanceTree(tree_d); -} - -/*get the tree of a deflated block with dynamic tree, the tree itself is also Huffman compressed with a known tree*/ -static unsigned getTreeInflateDynamic(HuffmanTree* tree_ll, HuffmanTree* tree_d, - LodePNGBitReader* reader) { - /*make sure that length values that aren't filled in will be 0, or a wrong tree will be generated*/ - unsigned error = 0; - unsigned n, HLIT, HDIST, HCLEN, i; - - /*see comments in deflateDynamic for explanation of the context and these variables, it is analogous*/ - unsigned* bitlen_ll = 0; /*lit,len code lengths*/ - unsigned* bitlen_d = 0; /*dist code lengths*/ - /*code length code lengths ("clcl"), the bit lengths of the huffman tree used to compress bitlen_ll and bitlen_d*/ - unsigned* bitlen_cl = 0; - HuffmanTree tree_cl; /*the code tree for code length codes (the huffman tree for compressed huffman trees)*/ - - if(!ensureBits17(reader, 14)) return 49; /*error: the bit pointer is or will go past the memory*/ - - /*number of literal/length codes + 257. Unlike the spec, the value 257 is added to it here already*/ - HLIT = readBits(reader, 5) + 257; - /*number of distance codes. Unlike the spec, the value 1 is added to it here already*/ - HDIST = readBits(reader, 5) + 1; - /*number of code length codes. Unlike the spec, the value 4 is added to it here already*/ - HCLEN = readBits(reader, 4) + 4; - - bitlen_cl = (unsigned*)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(unsigned)); - if(!bitlen_cl) return 83 /*alloc fail*/; - - HuffmanTree_init(&tree_cl); - - while(!error) { - /*read the code length codes out of 3 * (amount of code length codes) bits*/ - if(lodepng_gtofl(reader->bp, HCLEN * 3, reader->bitsize)) { - ERROR_BREAK(50); /*error: the bit pointer is or will go past the memory*/ - } - for(i = 0; i != HCLEN; ++i) { - ensureBits9(reader, 3); /*out of bounds already checked above */ - bitlen_cl[CLCL_ORDER[i]] = readBits(reader, 3); - } - for(i = HCLEN; i != NUM_CODE_LENGTH_CODES; ++i) { - bitlen_cl[CLCL_ORDER[i]] = 0; - } - - error = HuffmanTree_makeFromLengths(&tree_cl, bitlen_cl, NUM_CODE_LENGTH_CODES, 7); - if(error) break; - - /*now we can use this tree to read the lengths for the tree that this function will return*/ - bitlen_ll = (unsigned*)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned)); - bitlen_d = (unsigned*)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned)); - if(!bitlen_ll || !bitlen_d) ERROR_BREAK(83 /*alloc fail*/); - lodepng_memset(bitlen_ll, 0, NUM_DEFLATE_CODE_SYMBOLS * sizeof(*bitlen_ll)); - lodepng_memset(bitlen_d, 0, NUM_DISTANCE_SYMBOLS * sizeof(*bitlen_d)); - - /*i is the current symbol we're reading in the part that contains the code lengths of lit/len and dist codes*/ - i = 0; - while(i < HLIT + HDIST) { - unsigned code; - ensureBits25(reader, 22); /* up to 15 bits for huffman code, up to 7 extra bits below*/ - code = huffmanDecodeSymbol(reader, &tree_cl); - if(code <= 15) /*a length code*/ { - if(i < HLIT) bitlen_ll[i] = code; - else bitlen_d[i - HLIT] = code; - ++i; - } else if(code == 16) /*repeat previous*/ { - unsigned replength = 3; /*read in the 2 bits that indicate repeat length (3-6)*/ - unsigned value; /*set value to the previous code*/ - - if(i == 0) ERROR_BREAK(54); /*can't repeat previous if i is 0*/ - - replength += readBits(reader, 2); - - if(i < HLIT + 1) value = bitlen_ll[i - 1]; - else value = bitlen_d[i - HLIT - 1]; - /*repeat this value in the next lengths*/ - for(n = 0; n < replength; ++n) { - if(i >= HLIT + HDIST) ERROR_BREAK(13); /*error: i is larger than the amount of codes*/ - if(i < HLIT) bitlen_ll[i] = value; - else bitlen_d[i - HLIT] = value; - ++i; - } - } else if(code == 17) /*repeat "0" 3-10 times*/ { - unsigned replength = 3; /*read in the bits that indicate repeat length*/ - replength += readBits(reader, 3); - - /*repeat this value in the next lengths*/ - for(n = 0; n < replength; ++n) { - if(i >= HLIT + HDIST) ERROR_BREAK(14); /*error: i is larger than the amount of codes*/ - - if(i < HLIT) bitlen_ll[i] = 0; - else bitlen_d[i - HLIT] = 0; - ++i; - } - } else if(code == 18) /*repeat "0" 11-138 times*/ { - unsigned replength = 11; /*read in the bits that indicate repeat length*/ - replength += readBits(reader, 7); - - /*repeat this value in the next lengths*/ - for(n = 0; n < replength; ++n) { - if(i >= HLIT + HDIST) ERROR_BREAK(15); /*error: i is larger than the amount of codes*/ - - if(i < HLIT) bitlen_ll[i] = 0; - else bitlen_d[i - HLIT] = 0; - ++i; - } - } else /*if(code == INVALIDSYMBOL)*/ { - ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ - } - /*check if any of the ensureBits above went out of bounds*/ - if(reader->bp > reader->bitsize) { - /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol - (10=no endcode, 11=wrong jump outside of tree)*/ - /* TODO: revise error codes 10,11,50: the above comment is no longer valid */ - ERROR_BREAK(50); /*error, bit pointer jumps past memory*/ - } - } - if(error) break; - - if(bitlen_ll[256] == 0) ERROR_BREAK(64); /*the length of the end code 256 must be larger than 0*/ - - /*now we've finally got HLIT and HDIST, so generate the code trees, and the function is done*/ - error = HuffmanTree_makeFromLengths(tree_ll, bitlen_ll, NUM_DEFLATE_CODE_SYMBOLS, 15); - if(error) break; - error = HuffmanTree_makeFromLengths(tree_d, bitlen_d, NUM_DISTANCE_SYMBOLS, 15); - - break; /*end of error-while*/ - } - - lodepng_free(bitlen_cl); - lodepng_free(bitlen_ll); - lodepng_free(bitlen_d); - HuffmanTree_cleanup(&tree_cl); - - return error; -} - -/*inflate a block with dynamic of fixed Huffman tree. btype must be 1 or 2.*/ -static unsigned inflateHuffmanBlock(ucvector* out, LodePNGBitReader* reader, - unsigned btype, size_t max_output_size) { - unsigned error = 0; - HuffmanTree tree_ll; /*the huffman tree for literal and length codes*/ - HuffmanTree tree_d; /*the huffman tree for distance codes*/ - - HuffmanTree_init(&tree_ll); - HuffmanTree_init(&tree_d); - - if(btype == 1) error = getTreeInflateFixed(&tree_ll, &tree_d); - else /*if(btype == 2)*/ error = getTreeInflateDynamic(&tree_ll, &tree_d, reader); - - while(!error) /*decode all symbols until end reached, breaks at end code*/ { - /*code_ll is literal, length or end code*/ - unsigned code_ll; - ensureBits25(reader, 20); /* up to 15 for the huffman symbol, up to 5 for the length extra bits */ - code_ll = huffmanDecodeSymbol(reader, &tree_ll); - if(code_ll <= 255) /*literal symbol*/ { - if(!ucvector_resize(out, out->size + 1)) ERROR_BREAK(83 /*alloc fail*/); - out->data[out->size - 1] = (unsigned char)code_ll; - } else if(code_ll >= FIRST_LENGTH_CODE_INDEX && code_ll <= LAST_LENGTH_CODE_INDEX) /*length code*/ { - unsigned code_d, distance; - unsigned numextrabits_l, numextrabits_d; /*extra bits for length and distance*/ - size_t start, backward, length; - - /*part 1: get length base*/ - length = LENGTHBASE[code_ll - FIRST_LENGTH_CODE_INDEX]; - - /*part 2: get extra bits and add the value of that to length*/ - numextrabits_l = LENGTHEXTRA[code_ll - FIRST_LENGTH_CODE_INDEX]; - if(numextrabits_l != 0) { - /* bits already ensured above */ - length += readBits(reader, numextrabits_l); - } - - /*part 3: get distance code*/ - ensureBits32(reader, 28); /* up to 15 for the huffman symbol, up to 13 for the extra bits */ - code_d = huffmanDecodeSymbol(reader, &tree_d); - if(code_d > 29) { - if(code_d <= 31) { - ERROR_BREAK(18); /*error: invalid distance code (30-31 are never used)*/ - } else /* if(code_d == INVALIDSYMBOL) */{ - ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ - } - } - distance = DISTANCEBASE[code_d]; - - /*part 4: get extra bits from distance*/ - numextrabits_d = DISTANCEEXTRA[code_d]; - if(numextrabits_d != 0) { - /* bits already ensured above */ - distance += readBits(reader, numextrabits_d); - } - - /*part 5: fill in all the out[n] values based on the length and dist*/ - start = out->size; - if(distance > start) ERROR_BREAK(52); /*too long backward distance*/ - backward = start - distance; - - if(!ucvector_resize(out, out->size + length)) ERROR_BREAK(83 /*alloc fail*/); - if(distance < length) { - size_t forward; - lodepng_memcpy(out->data + start, out->data + backward, distance); - start += distance; - for(forward = distance; forward < length; ++forward) { - out->data[start++] = out->data[backward++]; - } - } else { - lodepng_memcpy(out->data + start, out->data + backward, length); - } - } else if(code_ll == 256) { - break; /*end code, break the loop*/ - } else /*if(code_ll == INVALIDSYMBOL)*/ { - ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ - } - /*check if any of the ensureBits above went out of bounds*/ - if(reader->bp > reader->bitsize) { - /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol - (10=no endcode, 11=wrong jump outside of tree)*/ - /* TODO: revise error codes 10,11,50: the above comment is no longer valid */ - ERROR_BREAK(51); /*error, bit pointer jumps past memory*/ - } - if(max_output_size && out->size > max_output_size) { - ERROR_BREAK(109); /*error, larger than max size*/ - } - } - - HuffmanTree_cleanup(&tree_ll); - HuffmanTree_cleanup(&tree_d); - - return error; -} - -static unsigned inflateNoCompression(ucvector* out, LodePNGBitReader* reader, - const LodePNGDecompressSettings* settings) { - size_t bytepos; - size_t size = reader->size; - unsigned LEN, NLEN, error = 0; - - /*go to first boundary of byte*/ - bytepos = (reader->bp + 7u) >> 3u; - - /*read LEN (2 bytes) and NLEN (2 bytes)*/ - if(bytepos + 4 >= size) return 52; /*error, bit pointer will jump past memory*/ - LEN = (unsigned)reader->data[bytepos] + ((unsigned)reader->data[bytepos + 1] << 8u); bytepos += 2; - NLEN = (unsigned)reader->data[bytepos] + ((unsigned)reader->data[bytepos + 1] << 8u); bytepos += 2; - - /*check if 16-bit NLEN is really the one's complement of LEN*/ - if(!settings->ignore_nlen && LEN + NLEN != 65535) { - return 21; /*error: NLEN is not one's complement of LEN*/ - } - - if(!ucvector_resize(out, out->size + LEN)) return 83; /*alloc fail*/ - - /*read the literal data: LEN bytes are now stored in the out buffer*/ - if(bytepos + LEN > size) return 23; /*error: reading outside of in buffer*/ - - lodepng_memcpy(out->data + out->size - LEN, reader->data + bytepos, LEN); - bytepos += LEN; - - reader->bp = bytepos << 3u; - - return error; -} - -static unsigned lodepng_inflatev(ucvector* out, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings) { - unsigned BFINAL = 0; - LodePNGBitReader reader; - unsigned error = LodePNGBitReader_init(&reader, in, insize); - - if(error) return error; - - while(!BFINAL) { - unsigned BTYPE; - if(!ensureBits9(&reader, 3)) return 52; /*error, bit pointer will jump past memory*/ - BFINAL = readBits(&reader, 1); - BTYPE = readBits(&reader, 2); - - if(BTYPE == 3) return 20; /*error: invalid BTYPE*/ - else if(BTYPE == 0) error = inflateNoCompression(out, &reader, settings); /*no compression*/ - else error = inflateHuffmanBlock(out, &reader, BTYPE, settings->max_output_size); /*compression, BTYPE 01 or 10*/ - if(!error && settings->max_output_size && out->size > settings->max_output_size) error = 109; - if(error) break; - } - - return error; -} - -unsigned lodepng_inflate(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings) { - ucvector v = ucvector_init(*out, *outsize); - unsigned error = lodepng_inflatev(&v, in, insize, settings); - *out = v.data; - *outsize = v.size; - return error; -} - -static unsigned inflatev(ucvector* out, const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings) { - if(settings->custom_inflate) { - unsigned error = settings->custom_inflate(&out->data, &out->size, in, insize, settings); - out->allocsize = out->size; - if(error) { - /*the custom inflate is allowed to have its own error codes, however, we translate it to code 110*/ - error = 110; - /*if there's a max output size, and the custom zlib returned error, then indicate that error instead*/ - if(settings->max_output_size && out->size > settings->max_output_size) error = 109; - } - return error; - } else { - return lodepng_inflatev(out, in, insize, settings); - } -} - -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Deflator (Compressor) / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -static const size_t MAX_SUPPORTED_DEFLATE_LENGTH = 258; - -/*search the index in the array, that has the largest value smaller than or equal to the given value, -given array must be sorted (if no value is smaller, it returns the size of the given array)*/ -static size_t searchCodeIndex(const unsigned* array, size_t array_size, size_t value) { - /*binary search (only small gain over linear). TODO: use CPU log2 instruction for getting symbols instead*/ - size_t left = 1; - size_t right = array_size - 1; - - while(left <= right) { - size_t mid = (left + right) >> 1; - if(array[mid] >= value) right = mid - 1; - else left = mid + 1; - } - if(left >= array_size || array[left] > value) left--; - return left; -} - -static void addLengthDistance(uivector* values, size_t length, size_t distance) { - /*values in encoded vector are those used by deflate: - 0-255: literal bytes - 256: end - 257-285: length/distance pair (length code, followed by extra length bits, distance code, extra distance bits) - 286-287: invalid*/ - - unsigned length_code = (unsigned)searchCodeIndex(LENGTHBASE, 29, length); - unsigned extra_length = (unsigned)(length - LENGTHBASE[length_code]); - unsigned dist_code = (unsigned)searchCodeIndex(DISTANCEBASE, 30, distance); - unsigned extra_distance = (unsigned)(distance - DISTANCEBASE[dist_code]); - - size_t pos = values->size; - /*TODO: return error when this fails (out of memory)*/ - unsigned ok = uivector_resize(values, values->size + 4); - if(ok) { - values->data[pos + 0] = length_code + FIRST_LENGTH_CODE_INDEX; - values->data[pos + 1] = extra_length; - values->data[pos + 2] = dist_code; - values->data[pos + 3] = extra_distance; - } -} - -/*3 bytes of data get encoded into two bytes. The hash cannot use more than 3 -bytes as input because 3 is the minimum match length for deflate*/ -static const unsigned HASH_NUM_VALUES = 65536; -static const unsigned HASH_BIT_MASK = 65535; /*HASH_NUM_VALUES - 1, but C90 does not like that as initializer*/ - -typedef struct Hash { - int* head; /*hash value to head circular pos - can be outdated if went around window*/ - /*circular pos to prev circular pos*/ - unsigned short* chain; - int* val; /*circular pos to hash value*/ - - /*TODO: do this not only for zeros but for any repeated byte. However for PNG - it's always going to be the zeros that dominate, so not important for PNG*/ - int* headz; /*similar to head, but for chainz*/ - unsigned short* chainz; /*those with same amount of zeros*/ - unsigned short* zeros; /*length of zeros streak, used as a second hash chain*/ -} Hash; - -static unsigned hash_init(Hash* hash, unsigned windowsize) { - unsigned i; - hash->head = (int*)lodepng_malloc(sizeof(int) * HASH_NUM_VALUES); - hash->val = (int*)lodepng_malloc(sizeof(int) * windowsize); - hash->chain = (unsigned short*)lodepng_malloc(sizeof(unsigned short) * windowsize); - - hash->zeros = (unsigned short*)lodepng_malloc(sizeof(unsigned short) * windowsize); - hash->headz = (int*)lodepng_malloc(sizeof(int) * (MAX_SUPPORTED_DEFLATE_LENGTH + 1)); - hash->chainz = (unsigned short*)lodepng_malloc(sizeof(unsigned short) * windowsize); - - if(!hash->head || !hash->chain || !hash->val || !hash->headz|| !hash->chainz || !hash->zeros) { - return 83; /*alloc fail*/ - } - - /*initialize hash table*/ - for(i = 0; i != HASH_NUM_VALUES; ++i) hash->head[i] = -1; - for(i = 0; i != windowsize; ++i) hash->val[i] = -1; - for(i = 0; i != windowsize; ++i) hash->chain[i] = i; /*same value as index indicates uninitialized*/ - - for(i = 0; i <= MAX_SUPPORTED_DEFLATE_LENGTH; ++i) hash->headz[i] = -1; - for(i = 0; i != windowsize; ++i) hash->chainz[i] = i; /*same value as index indicates uninitialized*/ - - return 0; -} - -static void hash_cleanup(Hash* hash) { - lodepng_free(hash->head); - lodepng_free(hash->val); - lodepng_free(hash->chain); - - lodepng_free(hash->zeros); - lodepng_free(hash->headz); - lodepng_free(hash->chainz); -} - - - -static unsigned getHash(const unsigned char* data, size_t size, size_t pos) { - unsigned result = 0; - if(pos + 2 < size) { - /*A simple shift and xor hash is used. Since the data of PNGs is dominated - by zeroes due to the filters, a better hash does not have a significant - effect on speed in traversing the chain, and causes more time spend on - calculating the hash.*/ - result ^= ((unsigned)data[pos + 0] << 0u); - result ^= ((unsigned)data[pos + 1] << 4u); - result ^= ((unsigned)data[pos + 2] << 8u); - } else { - size_t amount, i; - if(pos >= size) return 0; - amount = size - pos; - for(i = 0; i != amount; ++i) result ^= ((unsigned)data[pos + i] << (i * 8u)); - } - return result & HASH_BIT_MASK; -} - -static unsigned countZeros(const unsigned char* data, size_t size, size_t pos) { - const unsigned char* start = data + pos; - const unsigned char* end = start + MAX_SUPPORTED_DEFLATE_LENGTH; - if(end > data + size) end = data + size; - data = start; - while(data != end && *data == 0) ++data; - /*subtracting two addresses returned as 32-bit number (max value is MAX_SUPPORTED_DEFLATE_LENGTH)*/ - return (unsigned)(data - start); -} - -/*wpos = pos & (windowsize - 1)*/ -static void updateHashChain(Hash* hash, size_t wpos, unsigned hashval, unsigned short numzeros) { - hash->val[wpos] = (int)hashval; - if(hash->head[hashval] != -1) hash->chain[wpos] = hash->head[hashval]; - hash->head[hashval] = (int)wpos; - - hash->zeros[wpos] = numzeros; - if(hash->headz[numzeros] != -1) hash->chainz[wpos] = hash->headz[numzeros]; - hash->headz[numzeros] = (int)wpos; -} - -/* -LZ77-encode the data. Return value is error code. The input are raw bytes, the output -is in the form of unsigned integers with codes representing for example literal bytes, or -length/distance pairs. -It uses a hash table technique to let it encode faster. When doing LZ77 encoding, a -sliding window (of windowsize) is used, and all past bytes in that window can be used as -the "dictionary". A brute force search through all possible distances would be slow, and -this hash technique is one out of several ways to speed this up. -*/ -static unsigned encodeLZ77(uivector* out, Hash* hash, - const unsigned char* in, size_t inpos, size_t insize, unsigned windowsize, - unsigned minmatch, unsigned nicematch, unsigned lazymatching) { - size_t pos; - unsigned i, error = 0; - /*for large window lengths, assume the user wants no compression loss. Otherwise, max hash chain length speedup.*/ - unsigned maxchainlength = windowsize >= 8192 ? windowsize : windowsize / 8u; - unsigned maxlazymatch = windowsize >= 8192 ? MAX_SUPPORTED_DEFLATE_LENGTH : 64; - - unsigned usezeros = 1; /*not sure if setting it to false for windowsize < 8192 is better or worse*/ - unsigned numzeros = 0; - - unsigned offset; /*the offset represents the distance in LZ77 terminology*/ - unsigned length; - unsigned lazy = 0; - unsigned lazylength = 0, lazyoffset = 0; - unsigned hashval; - unsigned current_offset, current_length; - unsigned prev_offset; - const unsigned char *lastptr, *foreptr, *backptr; - unsigned hashpos; - - if(windowsize == 0 || windowsize > 32768) return 60; /*error: windowsize smaller/larger than allowed*/ - if((windowsize & (windowsize - 1)) != 0) return 90; /*error: must be power of two*/ - - if(nicematch > MAX_SUPPORTED_DEFLATE_LENGTH) nicematch = MAX_SUPPORTED_DEFLATE_LENGTH; - - for(pos = inpos; pos < insize; ++pos) { - size_t wpos = pos & (windowsize - 1); /*position for in 'circular' hash buffers*/ - unsigned chainlength = 0; - - hashval = getHash(in, insize, pos); - - if(usezeros && hashval == 0) { - if(numzeros == 0) numzeros = countZeros(in, insize, pos); - else if(pos + numzeros > insize || in[pos + numzeros - 1] != 0) --numzeros; - } else { - numzeros = 0; - } - - updateHashChain(hash, wpos, hashval, numzeros); - - /*the length and offset found for the current position*/ - length = 0; - offset = 0; - - hashpos = hash->chain[wpos]; - - lastptr = &in[insize < pos + MAX_SUPPORTED_DEFLATE_LENGTH ? insize : pos + MAX_SUPPORTED_DEFLATE_LENGTH]; - - /*search for the longest string*/ - prev_offset = 0; - for(;;) { - if(chainlength++ >= maxchainlength) break; - current_offset = (unsigned)(hashpos <= wpos ? wpos - hashpos : wpos - hashpos + windowsize); - - if(current_offset < prev_offset) break; /*stop when went completely around the circular buffer*/ - prev_offset = current_offset; - if(current_offset > 0) { - /*test the next characters*/ - foreptr = &in[pos]; - backptr = &in[pos - current_offset]; - - /*common case in PNGs is lots of zeros. Quickly skip over them as a speedup*/ - if(numzeros >= 3) { - unsigned skip = hash->zeros[hashpos]; - if(skip > numzeros) skip = numzeros; - backptr += skip; - foreptr += skip; - } - - while(foreptr != lastptr && *backptr == *foreptr) /*maximum supported length by deflate is max length*/ { - ++backptr; - ++foreptr; - } - current_length = (unsigned)(foreptr - &in[pos]); - - if(current_length > length) { - length = current_length; /*the longest length*/ - offset = current_offset; /*the offset that is related to this longest length*/ - /*jump out once a length of max length is found (speed gain). This also jumps - out if length is MAX_SUPPORTED_DEFLATE_LENGTH*/ - if(current_length >= nicematch) break; - } - } - - if(hashpos == hash->chain[hashpos]) break; - - if(numzeros >= 3 && length > numzeros) { - hashpos = hash->chainz[hashpos]; - if(hash->zeros[hashpos] != numzeros) break; - } else { - hashpos = hash->chain[hashpos]; - /*outdated hash value, happens if particular value was not encountered in whole last window*/ - if(hash->val[hashpos] != (int)hashval) break; - } - } - - if(lazymatching) { - if(!lazy && length >= 3 && length <= maxlazymatch && length < MAX_SUPPORTED_DEFLATE_LENGTH) { - lazy = 1; - lazylength = length; - lazyoffset = offset; - continue; /*try the next byte*/ - } - if(lazy) { - lazy = 0; - if(pos == 0) ERROR_BREAK(81); - if(length > lazylength + 1) { - /*push the previous character as literal*/ - if(!uivector_push_back(out, in[pos - 1])) ERROR_BREAK(83 /*alloc fail*/); - } else { - length = lazylength; - offset = lazyoffset; - hash->head[hashval] = -1; /*the same hashchain update will be done, this ensures no wrong alteration*/ - hash->headz[numzeros] = -1; /*idem*/ - --pos; - } - } - } - if(length >= 3 && offset > windowsize) ERROR_BREAK(86 /*too big (or overflown negative) offset*/); - - /*encode it as length/distance pair or literal value*/ - if(length < 3) /*only lengths of 3 or higher are supported as length/distance pair*/ { - if(!uivector_push_back(out, in[pos])) ERROR_BREAK(83 /*alloc fail*/); - } else if(length < minmatch || (length == 3 && offset > 4096)) { - /*compensate for the fact that longer offsets have more extra bits, a - length of only 3 may be not worth it then*/ - if(!uivector_push_back(out, in[pos])) ERROR_BREAK(83 /*alloc fail*/); - } else { - addLengthDistance(out, length, offset); - for(i = 1; i < length; ++i) { - ++pos; - wpos = pos & (windowsize - 1); - hashval = getHash(in, insize, pos); - if(usezeros && hashval == 0) { - if(numzeros == 0) numzeros = countZeros(in, insize, pos); - else if(pos + numzeros > insize || in[pos + numzeros - 1] != 0) --numzeros; - } else { - numzeros = 0; - } - updateHashChain(hash, wpos, hashval, numzeros); - } - } - } /*end of the loop through each character of input*/ - - return error; -} - -/* /////////////////////////////////////////////////////////////////////////// */ - -static unsigned deflateNoCompression(ucvector* out, const unsigned char* data, size_t datasize) { - /*non compressed deflate block data: 1 bit BFINAL,2 bits BTYPE,(5 bits): it jumps to start of next byte, - 2 bytes LEN, 2 bytes NLEN, LEN bytes literal DATA*/ - - size_t i, numdeflateblocks = (datasize + 65534u) / 65535u; - unsigned datapos = 0; - for(i = 0; i != numdeflateblocks; ++i) { - unsigned BFINAL, BTYPE, LEN, NLEN; - unsigned char firstbyte; - size_t pos = out->size; - - BFINAL = (i == numdeflateblocks - 1); - BTYPE = 0; - - LEN = 65535; - if(datasize - datapos < 65535u) LEN = (unsigned)datasize - datapos; - NLEN = 65535 - LEN; - - if(!ucvector_resize(out, out->size + LEN + 5)) return 83; /*alloc fail*/ - - firstbyte = (unsigned char)(BFINAL + ((BTYPE & 1u) << 1u) + ((BTYPE & 2u) << 1u)); - out->data[pos + 0] = firstbyte; - out->data[pos + 1] = (unsigned char)(LEN & 255); - out->data[pos + 2] = (unsigned char)(LEN >> 8u); - out->data[pos + 3] = (unsigned char)(NLEN & 255); - out->data[pos + 4] = (unsigned char)(NLEN >> 8u); - lodepng_memcpy(out->data + pos + 5, data + datapos, LEN); - datapos += LEN; - } - - return 0; -} - -/* -write the lz77-encoded data, which has lit, len and dist codes, to compressed stream using huffman trees. -tree_ll: the tree for lit and len codes. -tree_d: the tree for distance codes. -*/ -static void writeLZ77data(LodePNGBitWriter* writer, const uivector* lz77_encoded, - const HuffmanTree* tree_ll, const HuffmanTree* tree_d) { - size_t i = 0; - for(i = 0; i != lz77_encoded->size; ++i) { - unsigned val = lz77_encoded->data[i]; - writeBitsReversed(writer, tree_ll->codes[val], tree_ll->lengths[val]); - if(val > 256) /*for a length code, 3 more things have to be added*/ { - unsigned length_index = val - FIRST_LENGTH_CODE_INDEX; - unsigned n_length_extra_bits = LENGTHEXTRA[length_index]; - unsigned length_extra_bits = lz77_encoded->data[++i]; - - unsigned distance_code = lz77_encoded->data[++i]; - - unsigned distance_index = distance_code; - unsigned n_distance_extra_bits = DISTANCEEXTRA[distance_index]; - unsigned distance_extra_bits = lz77_encoded->data[++i]; - - writeBits(writer, length_extra_bits, n_length_extra_bits); - writeBitsReversed(writer, tree_d->codes[distance_code], tree_d->lengths[distance_code]); - writeBits(writer, distance_extra_bits, n_distance_extra_bits); - } - } -} - -/*Deflate for a block of type "dynamic", that is, with freely, optimally, created huffman trees*/ -static unsigned deflateDynamic(LodePNGBitWriter* writer, Hash* hash, - const unsigned char* data, size_t datapos, size_t dataend, - const LodePNGCompressSettings* settings, unsigned final) { - unsigned error = 0; - - /* - A block is compressed as follows: The PNG data is lz77 encoded, resulting in - literal bytes and length/distance pairs. This is then huffman compressed with - two huffman trees. One huffman tree is used for the lit and len values ("ll"), - another huffman tree is used for the dist values ("d"). These two trees are - stored using their code lengths, and to compress even more these code lengths - are also run-length encoded and huffman compressed. This gives a huffman tree - of code lengths "cl". The code lengths used to describe this third tree are - the code length code lengths ("clcl"). - */ - - /*The lz77 encoded data, represented with integers since there will also be length and distance codes in it*/ - uivector lz77_encoded; - HuffmanTree tree_ll; /*tree for lit,len values*/ - HuffmanTree tree_d; /*tree for distance codes*/ - HuffmanTree tree_cl; /*tree for encoding the code lengths representing tree_ll and tree_d*/ - unsigned* frequencies_ll = 0; /*frequency of lit,len codes*/ - unsigned* frequencies_d = 0; /*frequency of dist codes*/ - unsigned* frequencies_cl = 0; /*frequency of code length codes*/ - unsigned* bitlen_lld = 0; /*lit,len,dist code lengths (int bits), literally (without repeat codes).*/ - unsigned* bitlen_lld_e = 0; /*bitlen_lld encoded with repeat codes (this is a rudimentary run length compression)*/ - size_t datasize = dataend - datapos; - - /* - If we could call "bitlen_cl" the the code length code lengths ("clcl"), that is the bit lengths of codes to represent - tree_cl in CLCL_ORDER, then due to the huffman compression of huffman tree representations ("two levels"), there are - some analogies: - bitlen_lld is to tree_cl what data is to tree_ll and tree_d. - bitlen_lld_e is to bitlen_lld what lz77_encoded is to data. - bitlen_cl is to bitlen_lld_e what bitlen_lld is to lz77_encoded. - */ - - unsigned BFINAL = final; - size_t i; - size_t numcodes_ll, numcodes_d, numcodes_lld, numcodes_lld_e, numcodes_cl; - unsigned HLIT, HDIST, HCLEN; - - uivector_init(&lz77_encoded); - HuffmanTree_init(&tree_ll); - HuffmanTree_init(&tree_d); - HuffmanTree_init(&tree_cl); - /* could fit on stack, but >1KB is on the larger side so allocate instead */ - frequencies_ll = (unsigned*)lodepng_malloc(286 * sizeof(*frequencies_ll)); - frequencies_d = (unsigned*)lodepng_malloc(30 * sizeof(*frequencies_d)); - frequencies_cl = (unsigned*)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(*frequencies_cl)); - - if(!frequencies_ll || !frequencies_d || !frequencies_cl) error = 83; /*alloc fail*/ - - /*This while loop never loops due to a break at the end, it is here to - allow breaking out of it to the cleanup phase on error conditions.*/ - while(!error) { - lodepng_memset(frequencies_ll, 0, 286 * sizeof(*frequencies_ll)); - lodepng_memset(frequencies_d, 0, 30 * sizeof(*frequencies_d)); - lodepng_memset(frequencies_cl, 0, NUM_CODE_LENGTH_CODES * sizeof(*frequencies_cl)); - - if(settings->use_lz77) { - error = encodeLZ77(&lz77_encoded, hash, data, datapos, dataend, settings->windowsize, - settings->minmatch, settings->nicematch, settings->lazymatching); - if(error) break; - } else { - if(!uivector_resize(&lz77_encoded, datasize)) ERROR_BREAK(83 /*alloc fail*/); - for(i = datapos; i < dataend; ++i) lz77_encoded.data[i - datapos] = data[i]; /*no LZ77, but still will be Huffman compressed*/ - } - - /*Count the frequencies of lit, len and dist codes*/ - for(i = 0; i != lz77_encoded.size; ++i) { - unsigned symbol = lz77_encoded.data[i]; - ++frequencies_ll[symbol]; - if(symbol > 256) { - unsigned dist = lz77_encoded.data[i + 2]; - ++frequencies_d[dist]; - i += 3; - } - } - frequencies_ll[256] = 1; /*there will be exactly 1 end code, at the end of the block*/ - - /*Make both huffman trees, one for the lit and len codes, one for the dist codes*/ - error = HuffmanTree_makeFromFrequencies(&tree_ll, frequencies_ll, 257, 286, 15); - if(error) break; - /*2, not 1, is chosen for mincodes: some buggy PNG decoders require at least 2 symbols in the dist tree*/ - error = HuffmanTree_makeFromFrequencies(&tree_d, frequencies_d, 2, 30, 15); - if(error) break; - - numcodes_ll = LODEPNG_MIN(tree_ll.numcodes, 286); - numcodes_d = LODEPNG_MIN(tree_d.numcodes, 30); - /*store the code lengths of both generated trees in bitlen_lld*/ - numcodes_lld = numcodes_ll + numcodes_d; - bitlen_lld = (unsigned*)lodepng_malloc(numcodes_lld * sizeof(*bitlen_lld)); - /*numcodes_lld_e never needs more size than bitlen_lld*/ - bitlen_lld_e = (unsigned*)lodepng_malloc(numcodes_lld * sizeof(*bitlen_lld_e)); - if(!bitlen_lld || !bitlen_lld_e) ERROR_BREAK(83); /*alloc fail*/ - numcodes_lld_e = 0; - - for(i = 0; i != numcodes_ll; ++i) bitlen_lld[i] = tree_ll.lengths[i]; - for(i = 0; i != numcodes_d; ++i) bitlen_lld[numcodes_ll + i] = tree_d.lengths[i]; - - /*run-length compress bitlen_ldd into bitlen_lld_e by using repeat codes 16 (copy length 3-6 times), - 17 (3-10 zeroes), 18 (11-138 zeroes)*/ - for(i = 0; i != numcodes_lld; ++i) { - unsigned j = 0; /*amount of repetitions*/ - while(i + j + 1 < numcodes_lld && bitlen_lld[i + j + 1] == bitlen_lld[i]) ++j; - - if(bitlen_lld[i] == 0 && j >= 2) /*repeat code for zeroes*/ { - ++j; /*include the first zero*/ - if(j <= 10) /*repeat code 17 supports max 10 zeroes*/ { - bitlen_lld_e[numcodes_lld_e++] = 17; - bitlen_lld_e[numcodes_lld_e++] = j - 3; - } else /*repeat code 18 supports max 138 zeroes*/ { - if(j > 138) j = 138; - bitlen_lld_e[numcodes_lld_e++] = 18; - bitlen_lld_e[numcodes_lld_e++] = j - 11; - } - i += (j - 1); - } else if(j >= 3) /*repeat code for value other than zero*/ { - size_t k; - unsigned num = j / 6u, rest = j % 6u; - bitlen_lld_e[numcodes_lld_e++] = bitlen_lld[i]; - for(k = 0; k < num; ++k) { - bitlen_lld_e[numcodes_lld_e++] = 16; - bitlen_lld_e[numcodes_lld_e++] = 6 - 3; - } - if(rest >= 3) { - bitlen_lld_e[numcodes_lld_e++] = 16; - bitlen_lld_e[numcodes_lld_e++] = rest - 3; - } - else j -= rest; - i += j; - } else /*too short to benefit from repeat code*/ { - bitlen_lld_e[numcodes_lld_e++] = bitlen_lld[i]; - } - } - - /*generate tree_cl, the huffmantree of huffmantrees*/ - for(i = 0; i != numcodes_lld_e; ++i) { - ++frequencies_cl[bitlen_lld_e[i]]; - /*after a repeat code come the bits that specify the number of repetitions, - those don't need to be in the frequencies_cl calculation*/ - if(bitlen_lld_e[i] >= 16) ++i; - } - - error = HuffmanTree_makeFromFrequencies(&tree_cl, frequencies_cl, - NUM_CODE_LENGTH_CODES, NUM_CODE_LENGTH_CODES, 7); - if(error) break; - - /*compute amount of code-length-code-lengths to output*/ - numcodes_cl = NUM_CODE_LENGTH_CODES; - /*trim zeros at the end (using CLCL_ORDER), but minimum size must be 4 (see HCLEN below)*/ - while(numcodes_cl > 4u && tree_cl.lengths[CLCL_ORDER[numcodes_cl - 1u]] == 0) { - numcodes_cl--; - } - - /* - Write everything into the output - - After the BFINAL and BTYPE, the dynamic block consists out of the following: - - 5 bits HLIT, 5 bits HDIST, 4 bits HCLEN - - (HCLEN+4)*3 bits code lengths of code length alphabet - - HLIT + 257 code lengths of lit/length alphabet (encoded using the code length - alphabet, + possible repetition codes 16, 17, 18) - - HDIST + 1 code lengths of distance alphabet (encoded using the code length - alphabet, + possible repetition codes 16, 17, 18) - - compressed data - - 256 (end code) - */ - - /*Write block type*/ - writeBits(writer, BFINAL, 1); - writeBits(writer, 0, 1); /*first bit of BTYPE "dynamic"*/ - writeBits(writer, 1, 1); /*second bit of BTYPE "dynamic"*/ - - /*write the HLIT, HDIST and HCLEN values*/ - /*all three sizes take trimmed ending zeroes into account, done either by HuffmanTree_makeFromFrequencies - or in the loop for numcodes_cl above, which saves space. */ - HLIT = (unsigned)(numcodes_ll - 257); - HDIST = (unsigned)(numcodes_d - 1); - HCLEN = (unsigned)(numcodes_cl - 4); - writeBits(writer, HLIT, 5); - writeBits(writer, HDIST, 5); - writeBits(writer, HCLEN, 4); - - /*write the code lengths of the code length alphabet ("bitlen_cl")*/ - for(i = 0; i != numcodes_cl; ++i) writeBits(writer, tree_cl.lengths[CLCL_ORDER[i]], 3); - - /*write the lengths of the lit/len AND the dist alphabet*/ - for(i = 0; i != numcodes_lld_e; ++i) { - writeBitsReversed(writer, tree_cl.codes[bitlen_lld_e[i]], tree_cl.lengths[bitlen_lld_e[i]]); - /*extra bits of repeat codes*/ - if(bitlen_lld_e[i] == 16) writeBits(writer, bitlen_lld_e[++i], 2); - else if(bitlen_lld_e[i] == 17) writeBits(writer, bitlen_lld_e[++i], 3); - else if(bitlen_lld_e[i] == 18) writeBits(writer, bitlen_lld_e[++i], 7); - } - - /*write the compressed data symbols*/ - writeLZ77data(writer, &lz77_encoded, &tree_ll, &tree_d); - /*error: the length of the end code 256 must be larger than 0*/ - if(tree_ll.lengths[256] == 0) ERROR_BREAK(64); - - /*write the end code*/ - writeBitsReversed(writer, tree_ll.codes[256], tree_ll.lengths[256]); - - break; /*end of error-while*/ - } - - /*cleanup*/ - uivector_cleanup(&lz77_encoded); - HuffmanTree_cleanup(&tree_ll); - HuffmanTree_cleanup(&tree_d); - HuffmanTree_cleanup(&tree_cl); - lodepng_free(frequencies_ll); - lodepng_free(frequencies_d); - lodepng_free(frequencies_cl); - lodepng_free(bitlen_lld); - lodepng_free(bitlen_lld_e); - - return error; -} - -static unsigned deflateFixed(LodePNGBitWriter* writer, Hash* hash, - const unsigned char* data, - size_t datapos, size_t dataend, - const LodePNGCompressSettings* settings, unsigned final) { - HuffmanTree tree_ll; /*tree for literal values and length codes*/ - HuffmanTree tree_d; /*tree for distance codes*/ - - unsigned BFINAL = final; - unsigned error = 0; - size_t i; - - HuffmanTree_init(&tree_ll); - HuffmanTree_init(&tree_d); - - error = generateFixedLitLenTree(&tree_ll); - if(!error) error = generateFixedDistanceTree(&tree_d); - - if(!error) { - writeBits(writer, BFINAL, 1); - writeBits(writer, 1, 1); /*first bit of BTYPE*/ - writeBits(writer, 0, 1); /*second bit of BTYPE*/ - - if(settings->use_lz77) /*LZ77 encoded*/ { - uivector lz77_encoded; - uivector_init(&lz77_encoded); - error = encodeLZ77(&lz77_encoded, hash, data, datapos, dataend, settings->windowsize, - settings->minmatch, settings->nicematch, settings->lazymatching); - if(!error) writeLZ77data(writer, &lz77_encoded, &tree_ll, &tree_d); - uivector_cleanup(&lz77_encoded); - } else /*no LZ77, but still will be Huffman compressed*/ { - for(i = datapos; i < dataend; ++i) { - writeBitsReversed(writer, tree_ll.codes[data[i]], tree_ll.lengths[data[i]]); - } - } - /*add END code*/ - if(!error) writeBitsReversed(writer,tree_ll.codes[256], tree_ll.lengths[256]); - } - - /*cleanup*/ - HuffmanTree_cleanup(&tree_ll); - HuffmanTree_cleanup(&tree_d); - - return error; -} - -static unsigned lodepng_deflatev(ucvector* out, const unsigned char* in, size_t insize, - const LodePNGCompressSettings* settings) { - unsigned error = 0; - size_t i, blocksize, numdeflateblocks; - Hash hash; - LodePNGBitWriter writer; - - LodePNGBitWriter_init(&writer, out); - - if(settings->btype > 2) return 61; - else if(settings->btype == 0) return deflateNoCompression(out, in, insize); - else if(settings->btype == 1) blocksize = insize; - else /*if(settings->btype == 2)*/ { - /*on PNGs, deflate blocks of 65-262k seem to give most dense encoding*/ - blocksize = insize / 8u + 8; - if(blocksize < 65536) blocksize = 65536; - if(blocksize > 262144) blocksize = 262144; - } - - numdeflateblocks = (insize + blocksize - 1) / blocksize; - if(numdeflateblocks == 0) numdeflateblocks = 1; - - error = hash_init(&hash, settings->windowsize); - - if(!error) { - for(i = 0; i != numdeflateblocks && !error; ++i) { - unsigned final = (i == numdeflateblocks - 1); - size_t start = i * blocksize; - size_t end = start + blocksize; - if(end > insize) end = insize; - - if(settings->btype == 1) error = deflateFixed(&writer, &hash, in, start, end, settings, final); - else if(settings->btype == 2) error = deflateDynamic(&writer, &hash, in, start, end, settings, final); - } - } - - hash_cleanup(&hash); - - return error; -} - -unsigned lodepng_deflate(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGCompressSettings* settings) { - ucvector v = ucvector_init(*out, *outsize); - unsigned error = lodepng_deflatev(&v, in, insize, settings); - *out = v.data; - *outsize = v.size; - return error; -} - -static unsigned deflate(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGCompressSettings* settings) { - if(settings->custom_deflate) { - unsigned error = settings->custom_deflate(out, outsize, in, insize, settings); - /*the custom deflate is allowed to have its own error codes, however, we translate it to code 111*/ - return error ? 111 : 0; - } else { - return lodepng_deflate(out, outsize, in, insize, settings); - } -} - -#endif /*LODEPNG_COMPILE_DECODER*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Adler32 / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -static unsigned update_adler32(unsigned adler, const unsigned char* data, unsigned len) { - unsigned s1 = adler & 0xffffu; - unsigned s2 = (adler >> 16u) & 0xffffu; - - while(len != 0u) { - unsigned i; - /*at least 5552 sums can be done before the sums overflow, saving a lot of module divisions*/ - unsigned amount = len > 5552u ? 5552u : len; - len -= amount; - for(i = 0; i != amount; ++i) { - s1 += (*data++); - s2 += s1; - } - s1 %= 65521u; - s2 %= 65521u; - } - - return (s2 << 16u) | s1; -} - -/*Return the adler32 of the bytes data[0..len-1]*/ -static unsigned adler32(const unsigned char* data, unsigned len) { - return update_adler32(1u, data, len); -} - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Zlib / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_DECODER - -static unsigned lodepng_zlib_decompressv(ucvector* out, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings) { - unsigned error = 0; - unsigned CM, CINFO, FDICT; - - if(insize < 2) return 53; /*error, size of zlib data too small*/ - /*read information from zlib header*/ - if((in[0] * 256 + in[1]) % 31 != 0) { - /*error: 256 * in[0] + in[1] must be a multiple of 31, the FCHECK value is supposed to be made that way*/ - return 24; - } - - CM = in[0] & 15; - CINFO = (in[0] >> 4) & 15; - /*FCHECK = in[1] & 31;*/ /*FCHECK is already tested above*/ - FDICT = (in[1] >> 5) & 1; - /*FLEVEL = (in[1] >> 6) & 3;*/ /*FLEVEL is not used here*/ - - if(CM != 8 || CINFO > 7) { - /*error: only compression method 8: inflate with sliding window of 32k is supported by the PNG spec*/ - return 25; - } - if(FDICT != 0) { - /*error: the specification of PNG says about the zlib stream: - "The additional flags shall not specify a preset dictionary."*/ - return 26; - } - - error = inflatev(out, in + 2, insize - 2, settings); - if(error) return error; - - if(!settings->ignore_adler32) { - unsigned ADLER32 = lodepng_read32bitInt(&in[insize - 4]); - unsigned checksum = adler32(out->data, (unsigned)(out->size)); - if(checksum != ADLER32) return 58; /*error, adler checksum not correct, data must be corrupted*/ - } - - return 0; /*no error*/ -} - - -unsigned lodepng_zlib_decompress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGDecompressSettings* settings) { - ucvector v = ucvector_init(*out, *outsize); - unsigned error = lodepng_zlib_decompressv(&v, in, insize, settings); - *out = v.data; - *outsize = v.size; - return error; -} - -/*expected_size is expected output size, to avoid intermediate allocations. Set to 0 if not known. */ -static unsigned zlib_decompress(unsigned char** out, size_t* outsize, size_t expected_size, - const unsigned char* in, size_t insize, const LodePNGDecompressSettings* settings) { - unsigned error; - if(settings->custom_zlib) { - error = settings->custom_zlib(out, outsize, in, insize, settings); - if(error) { - /*the custom zlib is allowed to have its own error codes, however, we translate it to code 110*/ - error = 110; - /*if there's a max output size, and the custom zlib returned error, then indicate that error instead*/ - if(settings->max_output_size && *outsize > settings->max_output_size) error = 109; - } - } else { - ucvector v = ucvector_init(*out, *outsize); - if(expected_size) { - /*reserve the memory to avoid intermediate reallocations*/ - ucvector_resize(&v, *outsize + expected_size); - v.size = *outsize; - } - error = lodepng_zlib_decompressv(&v, in, insize, settings); - *out = v.data; - *outsize = v.size; - } - return error; -} - -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER - -unsigned lodepng_zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGCompressSettings* settings) { - size_t i; - unsigned error; - unsigned char* deflatedata = 0; - size_t deflatesize = 0; - - error = deflate(&deflatedata, &deflatesize, in, insize, settings); - - *out = NULL; - *outsize = 0; - if(!error) { - *outsize = deflatesize + 6; - *out = (unsigned char*)lodepng_malloc(*outsize); - if(!*out) error = 83; /*alloc fail*/ - } - - if(!error) { - unsigned ADLER32 = adler32(in, (unsigned)insize); - /*zlib data: 1 byte CMF (CM+CINFO), 1 byte FLG, deflate data, 4 byte ADLER32 checksum of the Decompressed data*/ - unsigned CMF = 120; /*0b01111000: CM 8, CINFO 7. With CINFO 7, any window size up to 32768 can be used.*/ - unsigned FLEVEL = 0; - unsigned FDICT = 0; - unsigned CMFFLG = 256 * CMF + FDICT * 32 + FLEVEL * 64; - unsigned FCHECK = 31 - CMFFLG % 31; - CMFFLG += FCHECK; - - (*out)[0] = (unsigned char)(CMFFLG >> 8); - (*out)[1] = (unsigned char)(CMFFLG & 255); - for(i = 0; i != deflatesize; ++i) (*out)[i + 2] = deflatedata[i]; - lodepng_set32bitInt(&(*out)[*outsize - 4], ADLER32); - } - - lodepng_free(deflatedata); - return error; -} - -/* compress using the default or custom zlib function */ -static unsigned zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGCompressSettings* settings) { - if(settings->custom_zlib) { - unsigned error = settings->custom_zlib(out, outsize, in, insize, settings); - /*the custom zlib is allowed to have its own error codes, however, we translate it to code 111*/ - return error ? 111 : 0; - } else { - return lodepng_zlib_compress(out, outsize, in, insize, settings); - } -} - -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#else /*no LODEPNG_COMPILE_ZLIB*/ - -#ifdef LODEPNG_COMPILE_DECODER -static unsigned zlib_decompress(unsigned char** out, size_t* outsize, size_t expected_size, - const unsigned char* in, size_t insize, const LodePNGDecompressSettings* settings) { - if(!settings->custom_zlib) return 87; /*no custom zlib function provided */ - (void)expected_size; - return settings->custom_zlib(out, outsize, in, insize, settings); -} -#endif /*LODEPNG_COMPILE_DECODER*/ -#ifdef LODEPNG_COMPILE_ENCODER -static unsigned zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGCompressSettings* settings) { - if(!settings->custom_zlib) return 87; /*no custom zlib function provided */ - return settings->custom_zlib(out, outsize, in, insize, settings); -} -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#endif /*LODEPNG_COMPILE_ZLIB*/ - -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_ENCODER - -/*this is a good tradeoff between speed and compression ratio*/ -#define DEFAULT_WINDOWSIZE 2048 - -void lodepng_compress_settings_init(LodePNGCompressSettings* settings) { - /*compress with dynamic huffman tree (not in the mathematical sense, just not the predefined one)*/ - settings->btype = 2; - settings->use_lz77 = 1; - settings->windowsize = DEFAULT_WINDOWSIZE; - settings->minmatch = 3; - settings->nicematch = 128; - settings->lazymatching = 1; - - settings->custom_zlib = 0; - settings->custom_deflate = 0; - settings->custom_context = 0; -} - -const LodePNGCompressSettings lodepng_default_compress_settings = {2, 1, DEFAULT_WINDOWSIZE, 3, 128, 1, 0, 0, 0}; - - -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#ifdef LODEPNG_COMPILE_DECODER - -void lodepng_decompress_settings_init(LodePNGDecompressSettings* settings) { - settings->ignore_adler32 = 0; - settings->ignore_nlen = 0; - settings->max_output_size = 0; - - settings->custom_zlib = 0; - settings->custom_inflate = 0; - settings->custom_context = 0; -} - -const LodePNGDecompressSettings lodepng_default_decompress_settings = {0, 0, 0, 0, 0, 0}; - -#endif /*LODEPNG_COMPILE_DECODER*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* // End of Zlib related code. Begin of PNG related code. // */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_PNG - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / CRC32 / */ -/* ////////////////////////////////////////////////////////////////////////// */ - - -#ifndef LODEPNG_NO_COMPILE_CRC -/* CRC polynomial: 0xedb88320 */ -static unsigned lodepng_crc32_table[256] = { - 0u, 1996959894u, 3993919788u, 2567524794u, 124634137u, 1886057615u, 3915621685u, 2657392035u, - 249268274u, 2044508324u, 3772115230u, 2547177864u, 162941995u, 2125561021u, 3887607047u, 2428444049u, - 498536548u, 1789927666u, 4089016648u, 2227061214u, 450548861u, 1843258603u, 4107580753u, 2211677639u, - 325883990u, 1684777152u, 4251122042u, 2321926636u, 335633487u, 1661365465u, 4195302755u, 2366115317u, - 997073096u, 1281953886u, 3579855332u, 2724688242u, 1006888145u, 1258607687u, 3524101629u, 2768942443u, - 901097722u, 1119000684u, 3686517206u, 2898065728u, 853044451u, 1172266101u, 3705015759u, 2882616665u, - 651767980u, 1373503546u, 3369554304u, 3218104598u, 565507253u, 1454621731u, 3485111705u, 3099436303u, - 671266974u, 1594198024u, 3322730930u, 2970347812u, 795835527u, 1483230225u, 3244367275u, 3060149565u, - 1994146192u, 31158534u, 2563907772u, 4023717930u, 1907459465u, 112637215u, 2680153253u, 3904427059u, - 2013776290u, 251722036u, 2517215374u, 3775830040u, 2137656763u, 141376813u, 2439277719u, 3865271297u, - 1802195444u, 476864866u, 2238001368u, 4066508878u, 1812370925u, 453092731u, 2181625025u, 4111451223u, - 1706088902u, 314042704u, 2344532202u, 4240017532u, 1658658271u, 366619977u, 2362670323u, 4224994405u, - 1303535960u, 984961486u, 2747007092u, 3569037538u, 1256170817u, 1037604311u, 2765210733u, 3554079995u, - 1131014506u, 879679996u, 2909243462u, 3663771856u, 1141124467u, 855842277u, 2852801631u, 3708648649u, - 1342533948u, 654459306u, 3188396048u, 3373015174u, 1466479909u, 544179635u, 3110523913u, 3462522015u, - 1591671054u, 702138776u, 2966460450u, 3352799412u, 1504918807u, 783551873u, 3082640443u, 3233442989u, - 3988292384u, 2596254646u, 62317068u, 1957810842u, 3939845945u, 2647816111u, 81470997u, 1943803523u, - 3814918930u, 2489596804u, 225274430u, 2053790376u, 3826175755u, 2466906013u, 167816743u, 2097651377u, - 4027552580u, 2265490386u, 503444072u, 1762050814u, 4150417245u, 2154129355u, 426522225u, 1852507879u, - 4275313526u, 2312317920u, 282753626u, 1742555852u, 4189708143u, 2394877945u, 397917763u, 1622183637u, - 3604390888u, 2714866558u, 953729732u, 1340076626u, 3518719985u, 2797360999u, 1068828381u, 1219638859u, - 3624741850u, 2936675148u, 906185462u, 1090812512u, 3747672003u, 2825379669u, 829329135u, 1181335161u, - 3412177804u, 3160834842u, 628085408u, 1382605366u, 3423369109u, 3138078467u, 570562233u, 1426400815u, - 3317316542u, 2998733608u, 733239954u, 1555261956u, 3268935591u, 3050360625u, 752459403u, 1541320221u, - 2607071920u, 3965973030u, 1969922972u, 40735498u, 2617837225u, 3943577151u, 1913087877u, 83908371u, - 2512341634u, 3803740692u, 2075208622u, 213261112u, 2463272603u, 3855990285u, 2094854071u, 198958881u, - 2262029012u, 4057260610u, 1759359992u, 534414190u, 2176718541u, 4139329115u, 1873836001u, 414664567u, - 2282248934u, 4279200368u, 1711684554u, 285281116u, 2405801727u, 4167216745u, 1634467795u, 376229701u, - 2685067896u, 3608007406u, 1308918612u, 956543938u, 2808555105u, 3495958263u, 1231636301u, 1047427035u, - 2932959818u, 3654703836u, 1088359270u, 936918000u, 2847714899u, 3736837829u, 1202900863u, 817233897u, - 3183342108u, 3401237130u, 1404277552u, 615818150u, 3134207493u, 3453421203u, 1423857449u, 601450431u, - 3009837614u, 3294710456u, 1567103746u, 711928724u, 3020668471u, 3272380065u, 1510334235u, 755167117u -}; - -/*Return the CRC of the bytes buf[0..len-1].*/ -unsigned lodepng_crc32(const unsigned char* data, size_t length) { - unsigned r = 0xffffffffu; - size_t i; - for(i = 0; i < length; ++i) { - r = lodepng_crc32_table[(r ^ data[i]) & 0xffu] ^ (r >> 8u); - } - return r ^ 0xffffffffu; -} -#else /* !LODEPNG_NO_COMPILE_CRC */ -unsigned lodepng_crc32(const unsigned char* data, size_t length); -#endif /* !LODEPNG_NO_COMPILE_CRC */ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Reading and writing PNG color channel bits / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/* The color channel bits of less-than-8-bit pixels are read with the MSB of bytes first, -so LodePNGBitWriter and LodePNGBitReader can't be used for those. */ - -static unsigned char readBitFromReversedStream(size_t* bitpointer, const unsigned char* bitstream) { - unsigned char result = (unsigned char)((bitstream[(*bitpointer) >> 3] >> (7 - ((*bitpointer) & 0x7))) & 1); - ++(*bitpointer); - return result; -} - -/* TODO: make this faster */ -static unsigned readBitsFromReversedStream(size_t* bitpointer, const unsigned char* bitstream, size_t nbits) { - unsigned result = 0; - size_t i; - for(i = 0 ; i < nbits; ++i) { - result <<= 1u; - result |= (unsigned)readBitFromReversedStream(bitpointer, bitstream); - } - return result; -} - -static void setBitOfReversedStream(size_t* bitpointer, unsigned char* bitstream, unsigned char bit) { - /*the current bit in bitstream may be 0 or 1 for this to work*/ - if(bit == 0) bitstream[(*bitpointer) >> 3u] &= (unsigned char)(~(1u << (7u - ((*bitpointer) & 7u)))); - else bitstream[(*bitpointer) >> 3u] |= (1u << (7u - ((*bitpointer) & 7u))); - ++(*bitpointer); -} - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / PNG chunks / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -unsigned lodepng_chunk_length(const unsigned char* chunk) { - return lodepng_read32bitInt(&chunk[0]); -} - -void lodepng_chunk_type(char type[5], const unsigned char* chunk) { - unsigned i; - for(i = 0; i != 4; ++i) type[i] = (char)chunk[4 + i]; - type[4] = 0; /*null termination char*/ -} - -unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type) { - if(lodepng_strlen(type) != 4) return 0; - return (chunk[4] == type[0] && chunk[5] == type[1] && chunk[6] == type[2] && chunk[7] == type[3]); -} - -unsigned char lodepng_chunk_ancillary(const unsigned char* chunk) { - return((chunk[4] & 32) != 0); -} - -unsigned char lodepng_chunk_private(const unsigned char* chunk) { - return((chunk[6] & 32) != 0); -} - -unsigned char lodepng_chunk_safetocopy(const unsigned char* chunk) { - return((chunk[7] & 32) != 0); -} - -unsigned char* lodepng_chunk_data(unsigned char* chunk) { - return &chunk[8]; -} - -const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk) { - return &chunk[8]; -} - -unsigned lodepng_chunk_check_crc(const unsigned char* chunk) { - unsigned length = lodepng_chunk_length(chunk); - unsigned CRC = lodepng_read32bitInt(&chunk[length + 8]); - /*the CRC is taken of the data and the 4 chunk type letters, not the length*/ - unsigned checksum = lodepng_crc32(&chunk[4], length + 4); - if(CRC != checksum) return 1; - else return 0; -} - -void lodepng_chunk_generate_crc(unsigned char* chunk) { - unsigned length = lodepng_chunk_length(chunk); - unsigned CRC = lodepng_crc32(&chunk[4], length + 4); - lodepng_set32bitInt(chunk + 8 + length, CRC); -} - -unsigned char* lodepng_chunk_next(unsigned char* chunk, unsigned char* end) { - if(chunk >= end || end - chunk < 12) return end; /*too small to contain a chunk*/ - if(chunk[0] == 0x89 && chunk[1] == 0x50 && chunk[2] == 0x4e && chunk[3] == 0x47 - && chunk[4] == 0x0d && chunk[5] == 0x0a && chunk[6] == 0x1a && chunk[7] == 0x0a) { - /* Is PNG magic header at start of PNG file. Jump to first actual chunk. */ - return chunk + 8; - } else { - size_t total_chunk_length; - unsigned char* result; - if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return end; - result = chunk + total_chunk_length; - if(result < chunk) return end; /*pointer overflow*/ - return result; - } -} - -const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk, const unsigned char* end) { - if(chunk >= end || end - chunk < 12) return end; /*too small to contain a chunk*/ - if(chunk[0] == 0x89 && chunk[1] == 0x50 && chunk[2] == 0x4e && chunk[3] == 0x47 - && chunk[4] == 0x0d && chunk[5] == 0x0a && chunk[6] == 0x1a && chunk[7] == 0x0a) { - /* Is PNG magic header at start of PNG file. Jump to first actual chunk. */ - return chunk + 8; - } else { - size_t total_chunk_length; - const unsigned char* result; - if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return end; - result = chunk + total_chunk_length; - if(result < chunk) return end; /*pointer overflow*/ - return result; - } -} - -unsigned char* lodepng_chunk_find(unsigned char* chunk, unsigned char* end, const char type[5]) { - for(;;) { - if(chunk >= end || end - chunk < 12) return 0; /* past file end: chunk + 12 > end */ - if(lodepng_chunk_type_equals(chunk, type)) return chunk; - chunk = lodepng_chunk_next(chunk, end); - } -} - -const unsigned char* lodepng_chunk_find_const(const unsigned char* chunk, const unsigned char* end, const char type[5]) { - for(;;) { - if(chunk >= end || end - chunk < 12) return 0; /* past file end: chunk + 12 > end */ - if(lodepng_chunk_type_equals(chunk, type)) return chunk; - chunk = lodepng_chunk_next_const(chunk, end); - } -} - -unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk) { - unsigned i; - size_t total_chunk_length, new_length; - unsigned char *chunk_start, *new_buffer; - - if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return 77; - if(lodepng_addofl(*outsize, total_chunk_length, &new_length)) return 77; - - new_buffer = (unsigned char*)lodepng_realloc(*out, new_length); - if(!new_buffer) return 83; /*alloc fail*/ - (*out) = new_buffer; - (*outsize) = new_length; - chunk_start = &(*out)[new_length - total_chunk_length]; - - for(i = 0; i != total_chunk_length; ++i) chunk_start[i] = chunk[i]; - - return 0; -} - -/*Sets length and name and allocates the space for data and crc but does not -set data or crc yet. Returns the start of the chunk in chunk. The start of -the data is at chunk + 8. To finalize chunk, add the data, then use -lodepng_chunk_generate_crc */ -static unsigned lodepng_chunk_init(unsigned char** chunk, - ucvector* out, - unsigned length, const char* type) { - size_t new_length = out->size; - if(lodepng_addofl(new_length, length, &new_length)) return 77; - if(lodepng_addofl(new_length, 12, &new_length)) return 77; - if(!ucvector_resize(out, new_length)) return 83; /*alloc fail*/ - *chunk = out->data + new_length - length - 12u; - - /*1: length*/ - lodepng_set32bitInt(*chunk, length); - - /*2: chunk name (4 letters)*/ - lodepng_memcpy(*chunk + 4, type, 4); - - return 0; -} - -/* like lodepng_chunk_create but with custom allocsize */ -static unsigned lodepng_chunk_createv(ucvector* out, - unsigned length, const char* type, const unsigned char* data) { - unsigned char* chunk; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, length, type)); - - /*3: the data*/ - lodepng_memcpy(chunk + 8, data, length); - - /*4: CRC (of the chunkname characters and the data)*/ - lodepng_chunk_generate_crc(chunk); - - return 0; -} - -unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize, - unsigned length, const char* type, const unsigned char* data) { - ucvector v = ucvector_init(*out, *outsize); - unsigned error = lodepng_chunk_createv(&v, length, type, data); - *out = v.data; - *outsize = v.size; - return error; -} - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Color types, channels, bits / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/*checks if the colortype is valid and the bitdepth bd is allowed for this colortype. -Return value is a LodePNG error code.*/ -static unsigned checkColorValidity(LodePNGColorType colortype, unsigned bd) { - switch(colortype) { - case LCT_GREY: if(!(bd == 1 || bd == 2 || bd == 4 || bd == 8 || bd == 16)) return 37; break; - case LCT_RGB: if(!( bd == 8 || bd == 16)) return 37; break; - case LCT_PALETTE: if(!(bd == 1 || bd == 2 || bd == 4 || bd == 8 )) return 37; break; - case LCT_GREY_ALPHA: if(!( bd == 8 || bd == 16)) return 37; break; - case LCT_RGBA: if(!( bd == 8 || bd == 16)) return 37; break; - case LCT_MAX_OCTET_VALUE: return 31; /* invalid color type */ - default: return 31; /* invalid color type */ - } - return 0; /*allowed color type / bits combination*/ -} - -static unsigned getNumColorChannels(LodePNGColorType colortype) { - switch(colortype) { - case LCT_GREY: return 1; - case LCT_RGB: return 3; - case LCT_PALETTE: return 1; - case LCT_GREY_ALPHA: return 2; - case LCT_RGBA: return 4; - case LCT_MAX_OCTET_VALUE: return 0; /* invalid color type */ - default: return 0; /*invalid color type*/ - } -} - -static unsigned lodepng_get_bpp_lct(LodePNGColorType colortype, unsigned bitdepth) { - /*bits per pixel is amount of channels * bits per channel*/ - return getNumColorChannels(colortype) * bitdepth; -} - -/* ////////////////////////////////////////////////////////////////////////// */ - -void lodepng_color_mode_init(LodePNGColorMode* info) { - info->key_defined = 0; - info->key_r = info->key_g = info->key_b = 0; - info->colortype = LCT_RGBA; - info->bitdepth = 8; - info->palette = 0; - info->palettesize = 0; -} - -/*allocates palette memory if needed, and initializes all colors to black*/ -static void lodepng_color_mode_alloc_palette(LodePNGColorMode* info) { - size_t i; - /*if the palette is already allocated, it will have size 1024 so no reallocation needed in that case*/ - /*the palette must have room for up to 256 colors with 4 bytes each.*/ - if(!info->palette) info->palette = (unsigned char*)lodepng_malloc(1024); - if(!info->palette) return; /*alloc fail*/ - for(i = 0; i != 256; ++i) { - /*Initialize all unused colors with black, the value used for invalid palette indices. - This is an error according to the PNG spec, but common PNG decoders make it black instead. - That makes color conversion slightly faster due to no error handling needed.*/ - info->palette[i * 4 + 0] = 0; - info->palette[i * 4 + 1] = 0; - info->palette[i * 4 + 2] = 0; - info->palette[i * 4 + 3] = 255; - } -} - -void lodepng_color_mode_cleanup(LodePNGColorMode* info) { - lodepng_palette_clear(info); -} - -unsigned lodepng_color_mode_copy(LodePNGColorMode* dest, const LodePNGColorMode* source) { - lodepng_color_mode_cleanup(dest); - lodepng_memcpy(dest, source, sizeof(LodePNGColorMode)); - if(source->palette) { - dest->palette = (unsigned char*)lodepng_malloc(1024); - if(!dest->palette && source->palettesize) return 83; /*alloc fail*/ - lodepng_memcpy(dest->palette, source->palette, source->palettesize * 4); - } - return 0; -} - -LodePNGColorMode lodepng_color_mode_make(LodePNGColorType colortype, unsigned bitdepth) { - LodePNGColorMode result; - lodepng_color_mode_init(&result); - result.colortype = colortype; - result.bitdepth = bitdepth; - return result; -} - -static int lodepng_color_mode_equal(const LodePNGColorMode* a, const LodePNGColorMode* b) { - size_t i; - if(a->colortype != b->colortype) return 0; - if(a->bitdepth != b->bitdepth) return 0; - if(a->key_defined != b->key_defined) return 0; - if(a->key_defined) { - if(a->key_r != b->key_r) return 0; - if(a->key_g != b->key_g) return 0; - if(a->key_b != b->key_b) return 0; - } - if(a->palettesize != b->palettesize) return 0; - for(i = 0; i != a->palettesize * 4; ++i) { - if(a->palette[i] != b->palette[i]) return 0; - } - return 1; -} - -void lodepng_palette_clear(LodePNGColorMode* info) { - if(info->palette) lodepng_free(info->palette); - info->palette = 0; - info->palettesize = 0; -} - -unsigned lodepng_palette_add(LodePNGColorMode* info, - unsigned char r, unsigned char g, unsigned char b, unsigned char a) { - if(!info->palette) /*allocate palette if empty*/ { - lodepng_color_mode_alloc_palette(info); - if(!info->palette) return 83; /*alloc fail*/ - } - if(info->palettesize >= 256) { - return 108; /*too many palette values*/ - } - info->palette[4 * info->palettesize + 0] = r; - info->palette[4 * info->palettesize + 1] = g; - info->palette[4 * info->palettesize + 2] = b; - info->palette[4 * info->palettesize + 3] = a; - ++info->palettesize; - return 0; -} - -/*calculate bits per pixel out of colortype and bitdepth*/ -unsigned lodepng_get_bpp(const LodePNGColorMode* info) { - return lodepng_get_bpp_lct(info->colortype, info->bitdepth); -} - -unsigned lodepng_get_channels(const LodePNGColorMode* info) { - return getNumColorChannels(info->colortype); -} - -unsigned lodepng_is_greyscale_type(const LodePNGColorMode* info) { - return info->colortype == LCT_GREY || info->colortype == LCT_GREY_ALPHA; -} - -unsigned lodepng_is_alpha_type(const LodePNGColorMode* info) { - return (info->colortype & 4) != 0; /*4 or 6*/ -} - -unsigned lodepng_is_palette_type(const LodePNGColorMode* info) { - return info->colortype == LCT_PALETTE; -} - -unsigned lodepng_has_palette_alpha(const LodePNGColorMode* info) { - size_t i; - for(i = 0; i != info->palettesize; ++i) { - if(info->palette[i * 4 + 3] < 255) return 1; - } - return 0; -} - -unsigned lodepng_can_have_alpha(const LodePNGColorMode* info) { - return info->key_defined - || lodepng_is_alpha_type(info) - || lodepng_has_palette_alpha(info); -} - -static size_t lodepng_get_raw_size_lct(unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) { - size_t bpp = lodepng_get_bpp_lct(colortype, bitdepth); - size_t n = (size_t)w * (size_t)h; - return ((n / 8u) * bpp) + ((n & 7u) * bpp + 7u) / 8u; -} - -size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* color) { - return lodepng_get_raw_size_lct(w, h, color->colortype, color->bitdepth); -} - - -#ifdef LODEPNG_COMPILE_PNG - -/*in an idat chunk, each scanline is a multiple of 8 bits, unlike the lodepng output buffer, -and in addition has one extra byte per line: the filter byte. So this gives a larger -result than lodepng_get_raw_size. Set h to 1 to get the size of 1 row including filter byte. */ -static size_t lodepng_get_raw_size_idat(unsigned w, unsigned h, unsigned bpp) { - /* + 1 for the filter byte, and possibly plus padding bits per line. */ - /* Ignoring casts, the expression is equal to (w * bpp + 7) / 8 + 1, but avoids overflow of w * bpp */ - size_t line = ((size_t)(w / 8u) * bpp) + 1u + ((w & 7u) * bpp + 7u) / 8u; - return (size_t)h * line; -} - -#ifdef LODEPNG_COMPILE_DECODER -/*Safely checks whether size_t overflow can be caused due to amount of pixels. -This check is overcautious rather than precise. If this check indicates no overflow, -you can safely compute in a size_t (but not an unsigned): --(size_t)w * (size_t)h * 8 --amount of bytes in IDAT (including filter, padding and Adam7 bytes) --amount of bytes in raw color model -Returns 1 if overflow possible, 0 if not. -*/ -static int lodepng_pixel_overflow(unsigned w, unsigned h, - const LodePNGColorMode* pngcolor, const LodePNGColorMode* rawcolor) { - size_t bpp = LODEPNG_MAX(lodepng_get_bpp(pngcolor), lodepng_get_bpp(rawcolor)); - size_t numpixels, total; - size_t line; /* bytes per line in worst case */ - - if(lodepng_mulofl((size_t)w, (size_t)h, &numpixels)) return 1; - if(lodepng_mulofl(numpixels, 8, &total)) return 1; /* bit pointer with 8-bit color, or 8 bytes per channel color */ - - /* Bytes per scanline with the expression "(w / 8u) * bpp) + ((w & 7u) * bpp + 7u) / 8u" */ - if(lodepng_mulofl((size_t)(w / 8u), bpp, &line)) return 1; - if(lodepng_addofl(line, ((w & 7u) * bpp + 7u) / 8u, &line)) return 1; - - if(lodepng_addofl(line, 5, &line)) return 1; /* 5 bytes overhead per line: 1 filterbyte, 4 for Adam7 worst case */ - if(lodepng_mulofl(line, h, &total)) return 1; /* Total bytes in worst case */ - - return 0; /* no overflow */ -} -#endif /*LODEPNG_COMPILE_DECODER*/ -#endif /*LODEPNG_COMPILE_PNG*/ - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - -static void LodePNGUnknownChunks_init(LodePNGInfo* info) { - unsigned i; - for(i = 0; i != 3; ++i) info->unknown_chunks_data[i] = 0; - for(i = 0; i != 3; ++i) info->unknown_chunks_size[i] = 0; -} - -static void LodePNGUnknownChunks_cleanup(LodePNGInfo* info) { - unsigned i; - for(i = 0; i != 3; ++i) lodepng_free(info->unknown_chunks_data[i]); -} - -static unsigned LodePNGUnknownChunks_copy(LodePNGInfo* dest, const LodePNGInfo* src) { - unsigned i; - - LodePNGUnknownChunks_cleanup(dest); - - for(i = 0; i != 3; ++i) { - size_t j; - dest->unknown_chunks_size[i] = src->unknown_chunks_size[i]; - dest->unknown_chunks_data[i] = (unsigned char*)lodepng_malloc(src->unknown_chunks_size[i]); - if(!dest->unknown_chunks_data[i] && dest->unknown_chunks_size[i]) return 83; /*alloc fail*/ - for(j = 0; j < src->unknown_chunks_size[i]; ++j) { - dest->unknown_chunks_data[i][j] = src->unknown_chunks_data[i][j]; - } - } - - return 0; -} - -/******************************************************************************/ - -static void LodePNGText_init(LodePNGInfo* info) { - info->text_num = 0; - info->text_keys = NULL; - info->text_strings = NULL; -} - -static void LodePNGText_cleanup(LodePNGInfo* info) { - size_t i; - for(i = 0; i != info->text_num; ++i) { - string_cleanup(&info->text_keys[i]); - string_cleanup(&info->text_strings[i]); - } - lodepng_free(info->text_keys); - lodepng_free(info->text_strings); -} - -static unsigned LodePNGText_copy(LodePNGInfo* dest, const LodePNGInfo* source) { - size_t i = 0; - dest->text_keys = NULL; - dest->text_strings = NULL; - dest->text_num = 0; - for(i = 0; i != source->text_num; ++i) { - CERROR_TRY_RETURN(lodepng_add_text(dest, source->text_keys[i], source->text_strings[i])); - } - return 0; -} - -static unsigned lodepng_add_text_sized(LodePNGInfo* info, const char* key, const char* str, size_t size) { - char** new_keys = (char**)(lodepng_realloc(info->text_keys, sizeof(char*) * (info->text_num + 1))); - char** new_strings = (char**)(lodepng_realloc(info->text_strings, sizeof(char*) * (info->text_num + 1))); - - if(new_keys) info->text_keys = new_keys; - if(new_strings) info->text_strings = new_strings; - - if(!new_keys || !new_strings) return 83; /*alloc fail*/ - - ++info->text_num; - info->text_keys[info->text_num - 1] = alloc_string(key); - info->text_strings[info->text_num - 1] = alloc_string_sized(str, size); - if(!info->text_keys[info->text_num - 1] || !info->text_strings[info->text_num - 1]) return 83; /*alloc fail*/ - - return 0; -} - -unsigned lodepng_add_text(LodePNGInfo* info, const char* key, const char* str) { - return lodepng_add_text_sized(info, key, str, lodepng_strlen(str)); -} - -void lodepng_clear_text(LodePNGInfo* info) { - LodePNGText_cleanup(info); -} - -/******************************************************************************/ - -static void LodePNGIText_init(LodePNGInfo* info) { - info->itext_num = 0; - info->itext_keys = NULL; - info->itext_langtags = NULL; - info->itext_transkeys = NULL; - info->itext_strings = NULL; -} - -static void LodePNGIText_cleanup(LodePNGInfo* info) { - size_t i; - for(i = 0; i != info->itext_num; ++i) { - string_cleanup(&info->itext_keys[i]); - string_cleanup(&info->itext_langtags[i]); - string_cleanup(&info->itext_transkeys[i]); - string_cleanup(&info->itext_strings[i]); - } - lodepng_free(info->itext_keys); - lodepng_free(info->itext_langtags); - lodepng_free(info->itext_transkeys); - lodepng_free(info->itext_strings); -} - -static unsigned LodePNGIText_copy(LodePNGInfo* dest, const LodePNGInfo* source) { - size_t i = 0; - dest->itext_keys = NULL; - dest->itext_langtags = NULL; - dest->itext_transkeys = NULL; - dest->itext_strings = NULL; - dest->itext_num = 0; - for(i = 0; i != source->itext_num; ++i) { - CERROR_TRY_RETURN(lodepng_add_itext(dest, source->itext_keys[i], source->itext_langtags[i], - source->itext_transkeys[i], source->itext_strings[i])); - } - return 0; -} - -void lodepng_clear_itext(LodePNGInfo* info) { - LodePNGIText_cleanup(info); -} - -static unsigned lodepng_add_itext_sized(LodePNGInfo* info, const char* key, const char* langtag, - const char* transkey, const char* str, size_t size) { - char** new_keys = (char**)(lodepng_realloc(info->itext_keys, sizeof(char*) * (info->itext_num + 1))); - char** new_langtags = (char**)(lodepng_realloc(info->itext_langtags, sizeof(char*) * (info->itext_num + 1))); - char** new_transkeys = (char**)(lodepng_realloc(info->itext_transkeys, sizeof(char*) * (info->itext_num + 1))); - char** new_strings = (char**)(lodepng_realloc(info->itext_strings, sizeof(char*) * (info->itext_num + 1))); - - if(new_keys) info->itext_keys = new_keys; - if(new_langtags) info->itext_langtags = new_langtags; - if(new_transkeys) info->itext_transkeys = new_transkeys; - if(new_strings) info->itext_strings = new_strings; - - if(!new_keys || !new_langtags || !new_transkeys || !new_strings) return 83; /*alloc fail*/ - - ++info->itext_num; - - info->itext_keys[info->itext_num - 1] = alloc_string(key); - info->itext_langtags[info->itext_num - 1] = alloc_string(langtag); - info->itext_transkeys[info->itext_num - 1] = alloc_string(transkey); - info->itext_strings[info->itext_num - 1] = alloc_string_sized(str, size); - - return 0; -} - -unsigned lodepng_add_itext(LodePNGInfo* info, const char* key, const char* langtag, - const char* transkey, const char* str) { - return lodepng_add_itext_sized(info, key, langtag, transkey, str, lodepng_strlen(str)); -} - -/* same as set but does not delete */ -static unsigned lodepng_assign_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size) { - if(profile_size == 0) return 100; /*invalid ICC profile size*/ - - info->iccp_name = alloc_string(name); - info->iccp_profile = (unsigned char*)lodepng_malloc(profile_size); - - if(!info->iccp_name || !info->iccp_profile) return 83; /*alloc fail*/ - - lodepng_memcpy(info->iccp_profile, profile, profile_size); - info->iccp_profile_size = profile_size; - - return 0; /*ok*/ -} - -unsigned lodepng_set_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size) { - if(info->iccp_name) lodepng_clear_icc(info); - info->iccp_defined = 1; - - return lodepng_assign_icc(info, name, profile, profile_size); -} - -void lodepng_clear_icc(LodePNGInfo* info) { - string_cleanup(&info->iccp_name); - lodepng_free(info->iccp_profile); - info->iccp_profile = NULL; - info->iccp_profile_size = 0; - info->iccp_defined = 0; -} -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -void lodepng_info_init(LodePNGInfo* info) { - lodepng_color_mode_init(&info->color); - info->interlace_method = 0; - info->compression_method = 0; - info->filter_method = 0; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - info->background_defined = 0; - info->background_r = info->background_g = info->background_b = 0; - - LodePNGText_init(info); - LodePNGIText_init(info); - - info->time_defined = 0; - info->phys_defined = 0; - - info->gama_defined = 0; - info->chrm_defined = 0; - info->srgb_defined = 0; - info->iccp_defined = 0; - info->iccp_name = NULL; - info->iccp_profile = NULL; - - LodePNGUnknownChunks_init(info); -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} - -void lodepng_info_cleanup(LodePNGInfo* info) { - lodepng_color_mode_cleanup(&info->color); -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - LodePNGText_cleanup(info); - LodePNGIText_cleanup(info); - - lodepng_clear_icc(info); - - LodePNGUnknownChunks_cleanup(info); -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} - -unsigned lodepng_info_copy(LodePNGInfo* dest, const LodePNGInfo* source) { - lodepng_info_cleanup(dest); - lodepng_memcpy(dest, source, sizeof(LodePNGInfo)); - lodepng_color_mode_init(&dest->color); - CERROR_TRY_RETURN(lodepng_color_mode_copy(&dest->color, &source->color)); - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - CERROR_TRY_RETURN(LodePNGText_copy(dest, source)); - CERROR_TRY_RETURN(LodePNGIText_copy(dest, source)); - if(source->iccp_defined) { - CERROR_TRY_RETURN(lodepng_assign_icc(dest, source->iccp_name, source->iccp_profile, source->iccp_profile_size)); - } - - LodePNGUnknownChunks_init(dest); - CERROR_TRY_RETURN(LodePNGUnknownChunks_copy(dest, source)); -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - return 0; -} - -/* ////////////////////////////////////////////////////////////////////////// */ - -/*index: bitgroup index, bits: bitgroup size(1, 2 or 4), in: bitgroup value, out: octet array to add bits to*/ -static void addColorBits(unsigned char* out, size_t index, unsigned bits, unsigned in) { - unsigned m = bits == 1 ? 7 : bits == 2 ? 3 : 1; /*8 / bits - 1*/ - /*p = the partial index in the byte, e.g. with 4 palettebits it is 0 for first half or 1 for second half*/ - unsigned p = index & m; - in &= (1u << bits) - 1u; /*filter out any other bits of the input value*/ - in = in << (bits * (m - p)); - if(p == 0) out[index * bits / 8u] = in; - else out[index * bits / 8u] |= in; -} - -typedef struct ColorTree ColorTree; - -/* -One node of a color tree -This is the data structure used to count the number of unique colors and to get a palette -index for a color. It's like an octree, but because the alpha channel is used too, each -node has 16 instead of 8 children. -*/ -struct ColorTree { - ColorTree* children[16]; /*up to 16 pointers to ColorTree of next level*/ - int index; /*the payload. Only has a meaningful value if this is in the last level*/ -}; - -static void color_tree_init(ColorTree* tree) { - lodepng_memset(tree->children, 0, 16 * sizeof(*tree->children)); - tree->index = -1; -} - -static void color_tree_cleanup(ColorTree* tree) { - int i; - for(i = 0; i != 16; ++i) { - if(tree->children[i]) { - color_tree_cleanup(tree->children[i]); - lodepng_free(tree->children[i]); - } - } -} - -/*returns -1 if color not present, its index otherwise*/ -static int color_tree_get(ColorTree* tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) { - int bit = 0; - for(bit = 0; bit < 8; ++bit) { - int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + 1 * ((a >> bit) & 1); - if(!tree->children[i]) return -1; - else tree = tree->children[i]; - } - return tree ? tree->index : -1; -} - -#ifdef LODEPNG_COMPILE_ENCODER -static int color_tree_has(ColorTree* tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) { - return color_tree_get(tree, r, g, b, a) >= 0; -} -#endif /*LODEPNG_COMPILE_ENCODER*/ - -/*color is not allowed to already exist. -Index should be >= 0 (it's signed to be compatible with using -1 for "doesn't exist") -Returns error code, or 0 if ok*/ -static unsigned color_tree_add(ColorTree* tree, - unsigned char r, unsigned char g, unsigned char b, unsigned char a, unsigned index) { - int bit; - for(bit = 0; bit < 8; ++bit) { - int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + 1 * ((a >> bit) & 1); - if(!tree->children[i]) { - tree->children[i] = (ColorTree*)lodepng_malloc(sizeof(ColorTree)); - if(!tree->children[i]) return 83; /*alloc fail*/ - color_tree_init(tree->children[i]); - } - tree = tree->children[i]; - } - tree->index = (int)index; - return 0; -} - -/*put a pixel, given its RGBA color, into image of any color type*/ -static unsigned rgba8ToPixel(unsigned char* out, size_t i, - const LodePNGColorMode* mode, ColorTree* tree /*for palette*/, - unsigned char r, unsigned char g, unsigned char b, unsigned char a) { - if(mode->colortype == LCT_GREY) { - unsigned char gray = r; /*((unsigned short)r + g + b) / 3u;*/ - if(mode->bitdepth == 8) out[i] = gray; - else if(mode->bitdepth == 16) out[i * 2 + 0] = out[i * 2 + 1] = gray; - else { - /*take the most significant bits of gray*/ - gray = ((unsigned)gray >> (8u - mode->bitdepth)) & ((1u << mode->bitdepth) - 1u); - addColorBits(out, i, mode->bitdepth, gray); - } - } else if(mode->colortype == LCT_RGB) { - if(mode->bitdepth == 8) { - out[i * 3 + 0] = r; - out[i * 3 + 1] = g; - out[i * 3 + 2] = b; - } else { - out[i * 6 + 0] = out[i * 6 + 1] = r; - out[i * 6 + 2] = out[i * 6 + 3] = g; - out[i * 6 + 4] = out[i * 6 + 5] = b; - } - } else if(mode->colortype == LCT_PALETTE) { - int index = color_tree_get(tree, r, g, b, a); - if(index < 0) return 82; /*color not in palette*/ - if(mode->bitdepth == 8) out[i] = index; - else addColorBits(out, i, mode->bitdepth, (unsigned)index); - } else if(mode->colortype == LCT_GREY_ALPHA) { - unsigned char gray = r; /*((unsigned short)r + g + b) / 3u;*/ - if(mode->bitdepth == 8) { - out[i * 2 + 0] = gray; - out[i * 2 + 1] = a; - } else if(mode->bitdepth == 16) { - out[i * 4 + 0] = out[i * 4 + 1] = gray; - out[i * 4 + 2] = out[i * 4 + 3] = a; - } - } else if(mode->colortype == LCT_RGBA) { - if(mode->bitdepth == 8) { - out[i * 4 + 0] = r; - out[i * 4 + 1] = g; - out[i * 4 + 2] = b; - out[i * 4 + 3] = a; - } else { - out[i * 8 + 0] = out[i * 8 + 1] = r; - out[i * 8 + 2] = out[i * 8 + 3] = g; - out[i * 8 + 4] = out[i * 8 + 5] = b; - out[i * 8 + 6] = out[i * 8 + 7] = a; - } - } - - return 0; /*no error*/ -} - -/*put a pixel, given its RGBA16 color, into image of any color 16-bitdepth type*/ -static void rgba16ToPixel(unsigned char* out, size_t i, - const LodePNGColorMode* mode, - unsigned short r, unsigned short g, unsigned short b, unsigned short a) { - if(mode->colortype == LCT_GREY) { - unsigned short gray = r; /*((unsigned)r + g + b) / 3u;*/ - out[i * 2 + 0] = (gray >> 8) & 255; - out[i * 2 + 1] = gray & 255; - } else if(mode->colortype == LCT_RGB) { - out[i * 6 + 0] = (r >> 8) & 255; - out[i * 6 + 1] = r & 255; - out[i * 6 + 2] = (g >> 8) & 255; - out[i * 6 + 3] = g & 255; - out[i * 6 + 4] = (b >> 8) & 255; - out[i * 6 + 5] = b & 255; - } else if(mode->colortype == LCT_GREY_ALPHA) { - unsigned short gray = r; /*((unsigned)r + g + b) / 3u;*/ - out[i * 4 + 0] = (gray >> 8) & 255; - out[i * 4 + 1] = gray & 255; - out[i * 4 + 2] = (a >> 8) & 255; - out[i * 4 + 3] = a & 255; - } else if(mode->colortype == LCT_RGBA) { - out[i * 8 + 0] = (r >> 8) & 255; - out[i * 8 + 1] = r & 255; - out[i * 8 + 2] = (g >> 8) & 255; - out[i * 8 + 3] = g & 255; - out[i * 8 + 4] = (b >> 8) & 255; - out[i * 8 + 5] = b & 255; - out[i * 8 + 6] = (a >> 8) & 255; - out[i * 8 + 7] = a & 255; - } -} - -/*Get RGBA8 color of pixel with index i (y * width + x) from the raw image with given color type.*/ -static void getPixelColorRGBA8(unsigned char* r, unsigned char* g, - unsigned char* b, unsigned char* a, - const unsigned char* in, size_t i, - const LodePNGColorMode* mode) { - if(mode->colortype == LCT_GREY) { - if(mode->bitdepth == 8) { - *r = *g = *b = in[i]; - if(mode->key_defined && *r == mode->key_r) *a = 0; - else *a = 255; - } else if(mode->bitdepth == 16) { - *r = *g = *b = in[i * 2 + 0]; - if(mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) *a = 0; - else *a = 255; - } else { - unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ - size_t j = i * mode->bitdepth; - unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); - *r = *g = *b = (value * 255) / highest; - if(mode->key_defined && value == mode->key_r) *a = 0; - else *a = 255; - } - } else if(mode->colortype == LCT_RGB) { - if(mode->bitdepth == 8) { - *r = in[i * 3 + 0]; *g = in[i * 3 + 1]; *b = in[i * 3 + 2]; - if(mode->key_defined && *r == mode->key_r && *g == mode->key_g && *b == mode->key_b) *a = 0; - else *a = 255; - } else { - *r = in[i * 6 + 0]; - *g = in[i * 6 + 2]; - *b = in[i * 6 + 4]; - if(mode->key_defined && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r - && 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g - && 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) *a = 0; - else *a = 255; - } - } else if(mode->colortype == LCT_PALETTE) { - unsigned index; - if(mode->bitdepth == 8) index = in[i]; - else { - size_t j = i * mode->bitdepth; - index = readBitsFromReversedStream(&j, in, mode->bitdepth); - } - /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ - *r = mode->palette[index * 4 + 0]; - *g = mode->palette[index * 4 + 1]; - *b = mode->palette[index * 4 + 2]; - *a = mode->palette[index * 4 + 3]; - } else if(mode->colortype == LCT_GREY_ALPHA) { - if(mode->bitdepth == 8) { - *r = *g = *b = in[i * 2 + 0]; - *a = in[i * 2 + 1]; - } else { - *r = *g = *b = in[i * 4 + 0]; - *a = in[i * 4 + 2]; - } - } else if(mode->colortype == LCT_RGBA) { - if(mode->bitdepth == 8) { - *r = in[i * 4 + 0]; - *g = in[i * 4 + 1]; - *b = in[i * 4 + 2]; - *a = in[i * 4 + 3]; - } else { - *r = in[i * 8 + 0]; - *g = in[i * 8 + 2]; - *b = in[i * 8 + 4]; - *a = in[i * 8 + 6]; - } - } -} - -/*Similar to getPixelColorRGBA8, but with all the for loops inside of the color -mode test cases, optimized to convert the colors much faster, when converting -to the common case of RGBA with 8 bit per channel. buffer must be RGBA with -enough memory.*/ -static void getPixelColorsRGBA8(unsigned char* LODEPNG_RESTRICT buffer, size_t numpixels, - const unsigned char* LODEPNG_RESTRICT in, - const LodePNGColorMode* mode) { - unsigned num_channels = 4; - size_t i; - if(mode->colortype == LCT_GREY) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i]; - buffer[3] = 255; - } - if(mode->key_defined) { - buffer -= numpixels * num_channels; - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - if(buffer[0] == mode->key_r) buffer[3] = 0; - } - } - } else if(mode->bitdepth == 16) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 2]; - buffer[3] = mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r ? 0 : 255; - } - } else { - unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ - size_t j = 0; - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); - buffer[0] = buffer[1] = buffer[2] = (value * 255) / highest; - buffer[3] = mode->key_defined && value == mode->key_r ? 0 : 255; - } - } - } else if(mode->colortype == LCT_RGB) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - lodepng_memcpy(buffer, &in[i * 3], 3); - buffer[3] = 255; - } - if(mode->key_defined) { - buffer -= numpixels * num_channels; - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - if(buffer[0] == mode->key_r && buffer[1]== mode->key_g && buffer[2] == mode->key_b) buffer[3] = 0; - } - } - } else { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = in[i * 6 + 0]; - buffer[1] = in[i * 6 + 2]; - buffer[2] = in[i * 6 + 4]; - buffer[3] = mode->key_defined - && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r - && 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g - && 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b ? 0 : 255; - } - } - } else if(mode->colortype == LCT_PALETTE) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - unsigned index = in[i]; - /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ - lodepng_memcpy(buffer, &mode->palette[index * 4], 4); - } - } else { - size_t j = 0; - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - unsigned index = readBitsFromReversedStream(&j, in, mode->bitdepth); - /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ - lodepng_memcpy(buffer, &mode->palette[index * 4], 4); - } - } - } else if(mode->colortype == LCT_GREY_ALPHA) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 2 + 0]; - buffer[3] = in[i * 2 + 1]; - } - } else { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 4 + 0]; - buffer[3] = in[i * 4 + 2]; - } - } - } else if(mode->colortype == LCT_RGBA) { - if(mode->bitdepth == 8) { - lodepng_memcpy(buffer, in, numpixels * 4); - } else { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = in[i * 8 + 0]; - buffer[1] = in[i * 8 + 2]; - buffer[2] = in[i * 8 + 4]; - buffer[3] = in[i * 8 + 6]; - } - } - } -} - -/*Similar to getPixelColorsRGBA8, but with 3-channel RGB output.*/ -static void getPixelColorsRGB8(unsigned char* LODEPNG_RESTRICT buffer, size_t numpixels, - const unsigned char* LODEPNG_RESTRICT in, - const LodePNGColorMode* mode) { - const unsigned num_channels = 3; - size_t i; - if(mode->colortype == LCT_GREY) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i]; - } - } else if(mode->bitdepth == 16) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 2]; - } - } else { - unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ - size_t j = 0; - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); - buffer[0] = buffer[1] = buffer[2] = (value * 255) / highest; - } - } - } else if(mode->colortype == LCT_RGB) { - if(mode->bitdepth == 8) { - lodepng_memcpy(buffer, in, numpixels * 3); - } else { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = in[i * 6 + 0]; - buffer[1] = in[i * 6 + 2]; - buffer[2] = in[i * 6 + 4]; - } - } - } else if(mode->colortype == LCT_PALETTE) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - unsigned index = in[i]; - /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ - lodepng_memcpy(buffer, &mode->palette[index * 4], 3); - } - } else { - size_t j = 0; - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - unsigned index = readBitsFromReversedStream(&j, in, mode->bitdepth); - /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ - lodepng_memcpy(buffer, &mode->palette[index * 4], 3); - } - } - } else if(mode->colortype == LCT_GREY_ALPHA) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 2 + 0]; - } - } else { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 4 + 0]; - } - } - } else if(mode->colortype == LCT_RGBA) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - lodepng_memcpy(buffer, &in[i * 4], 3); - } - } else { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = in[i * 8 + 0]; - buffer[1] = in[i * 8 + 2]; - buffer[2] = in[i * 8 + 4]; - } - } - } -} - -/*Get RGBA16 color of pixel with index i (y * width + x) from the raw image with -given color type, but the given color type must be 16-bit itself.*/ -static void getPixelColorRGBA16(unsigned short* r, unsigned short* g, unsigned short* b, unsigned short* a, - const unsigned char* in, size_t i, const LodePNGColorMode* mode) { - if(mode->colortype == LCT_GREY) { - *r = *g = *b = 256 * in[i * 2 + 0] + in[i * 2 + 1]; - if(mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) *a = 0; - else *a = 65535; - } else if(mode->colortype == LCT_RGB) { - *r = 256u * in[i * 6 + 0] + in[i * 6 + 1]; - *g = 256u * in[i * 6 + 2] + in[i * 6 + 3]; - *b = 256u * in[i * 6 + 4] + in[i * 6 + 5]; - if(mode->key_defined - && 256u * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r - && 256u * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g - && 256u * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) *a = 0; - else *a = 65535; - } else if(mode->colortype == LCT_GREY_ALPHA) { - *r = *g = *b = 256u * in[i * 4 + 0] + in[i * 4 + 1]; - *a = 256u * in[i * 4 + 2] + in[i * 4 + 3]; - } else if(mode->colortype == LCT_RGBA) { - *r = 256u * in[i * 8 + 0] + in[i * 8 + 1]; - *g = 256u * in[i * 8 + 2] + in[i * 8 + 3]; - *b = 256u * in[i * 8 + 4] + in[i * 8 + 5]; - *a = 256u * in[i * 8 + 6] + in[i * 8 + 7]; - } -} - -unsigned lodepng_convert(unsigned char* out, const unsigned char* in, - const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in, - unsigned w, unsigned h) { - size_t i; - ColorTree tree; - size_t numpixels = (size_t)w * (size_t)h; - unsigned error = 0; - - if(mode_in->colortype == LCT_PALETTE && !mode_in->palette) { - return 107; /* error: must provide palette if input mode is palette */ - } - - if(lodepng_color_mode_equal(mode_out, mode_in)) { - size_t numbytes = lodepng_get_raw_size(w, h, mode_in); - lodepng_memcpy(out, in, numbytes); - return 0; - } - - if(mode_out->colortype == LCT_PALETTE) { - size_t palettesize = mode_out->palettesize; - const unsigned char* palette = mode_out->palette; - size_t palsize = (size_t)1u << mode_out->bitdepth; - /*if the user specified output palette but did not give the values, assume - they want the values of the input color type (assuming that one is palette). - Note that we never create a new palette ourselves.*/ - if(palettesize == 0) { - palettesize = mode_in->palettesize; - palette = mode_in->palette; - /*if the input was also palette with same bitdepth, then the color types are also - equal, so copy literally. This to preserve the exact indices that were in the PNG - even in case there are duplicate colors in the palette.*/ - if(mode_in->colortype == LCT_PALETTE && mode_in->bitdepth == mode_out->bitdepth) { - size_t numbytes = lodepng_get_raw_size(w, h, mode_in); - lodepng_memcpy(out, in, numbytes); - return 0; - } - } - if(palettesize < palsize) palsize = palettesize; - color_tree_init(&tree); - for(i = 0; i != palsize; ++i) { - const unsigned char* p = &palette[i * 4]; - error = color_tree_add(&tree, p[0], p[1], p[2], p[3], (unsigned)i); - if(error) break; - } - } - - if(!error) { - if(mode_in->bitdepth == 16 && mode_out->bitdepth == 16) { - for(i = 0; i != numpixels; ++i) { - unsigned short r = 0, g = 0, b = 0, a = 0; - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); - rgba16ToPixel(out, i, mode_out, r, g, b, a); - } - } else if(mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGBA) { - getPixelColorsRGBA8(out, numpixels, in, mode_in); - } else if(mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGB) { - getPixelColorsRGB8(out, numpixels, in, mode_in); - } else { - unsigned char r = 0, g = 0, b = 0, a = 0; - for(i = 0; i != numpixels; ++i) { - getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); - error = rgba8ToPixel(out, i, mode_out, &tree, r, g, b, a); - if(error) break; - } - } - } - - if(mode_out->colortype == LCT_PALETTE) { - color_tree_cleanup(&tree); - } - - return error; -} - - -/* Converts a single rgb color without alpha from one type to another, color bits truncated to -their bitdepth. In case of single channel (gray or palette), only the r channel is used. Slow -function, do not use to process all pixels of an image. Alpha channel not supported on purpose: -this is for bKGD, supporting alpha may prevent it from finding a color in the palette, from the -specification it looks like bKGD should ignore the alpha values of the palette since it can use -any palette index but doesn't have an alpha channel. Idem with ignoring color key. */ -unsigned lodepng_convert_rgb( - unsigned* r_out, unsigned* g_out, unsigned* b_out, - unsigned r_in, unsigned g_in, unsigned b_in, - const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in) { - unsigned r = 0, g = 0, b = 0; - unsigned mul = 65535 / ((1u << mode_in->bitdepth) - 1u); /*65535, 21845, 4369, 257, 1*/ - unsigned shift = 16 - mode_out->bitdepth; - - if(mode_in->colortype == LCT_GREY || mode_in->colortype == LCT_GREY_ALPHA) { - r = g = b = r_in * mul; - } else if(mode_in->colortype == LCT_RGB || mode_in->colortype == LCT_RGBA) { - r = r_in * mul; - g = g_in * mul; - b = b_in * mul; - } else if(mode_in->colortype == LCT_PALETTE) { - if(r_in >= mode_in->palettesize) return 82; - r = mode_in->palette[r_in * 4 + 0] * 257u; - g = mode_in->palette[r_in * 4 + 1] * 257u; - b = mode_in->palette[r_in * 4 + 2] * 257u; - } else { - return 31; - } - - /* now convert to output format */ - if(mode_out->colortype == LCT_GREY || mode_out->colortype == LCT_GREY_ALPHA) { - *r_out = r >> shift ; - } else if(mode_out->colortype == LCT_RGB || mode_out->colortype == LCT_RGBA) { - *r_out = r >> shift ; - *g_out = g >> shift ; - *b_out = b >> shift ; - } else if(mode_out->colortype == LCT_PALETTE) { - unsigned i; - /* a 16-bit color cannot be in the palette */ - if((r >> 8) != (r & 255) || (g >> 8) != (g & 255) || (b >> 8) != (b & 255)) return 82; - for(i = 0; i < mode_out->palettesize; i++) { - unsigned j = i * 4; - if((r >> 8) == mode_out->palette[j + 0] && (g >> 8) == mode_out->palette[j + 1] && - (b >> 8) == mode_out->palette[j + 2]) { - *r_out = i; - return 0; - } - } - return 82; - } else { - return 31; - } - - return 0; -} - -#ifdef LODEPNG_COMPILE_ENCODER - -void lodepng_color_stats_init(LodePNGColorStats* stats) { - /*stats*/ - stats->colored = 0; - stats->key = 0; - stats->key_r = stats->key_g = stats->key_b = 0; - stats->alpha = 0; - stats->numcolors = 0; - stats->bits = 1; - stats->numpixels = 0; - /*settings*/ - stats->allow_palette = 1; - stats->allow_greyscale = 1; -} - -/*function used for debug purposes with C++*/ -/*void printColorStats(LodePNGColorStats* p) { - std::cout << "colored: " << (int)p->colored << ", "; - std::cout << "key: " << (int)p->key << ", "; - std::cout << "key_r: " << (int)p->key_r << ", "; - std::cout << "key_g: " << (int)p->key_g << ", "; - std::cout << "key_b: " << (int)p->key_b << ", "; - std::cout << "alpha: " << (int)p->alpha << ", "; - std::cout << "numcolors: " << (int)p->numcolors << ", "; - std::cout << "bits: " << (int)p->bits << std::endl; -}*/ - -/*Returns how many bits needed to represent given value (max 8 bit)*/ -static unsigned getValueRequiredBits(unsigned char value) { - if(value == 0 || value == 255) return 1; - /*The scaling of 2-bit and 4-bit values uses multiples of 85 and 17*/ - if(value % 17 == 0) return value % 85 == 0 ? 2 : 4; - return 8; -} - -/*stats must already have been inited. */ -unsigned lodepng_compute_color_stats(LodePNGColorStats* stats, - const unsigned char* in, unsigned w, unsigned h, - const LodePNGColorMode* mode_in) { - size_t i; - ColorTree tree; - size_t numpixels = (size_t)w * (size_t)h; - unsigned error = 0; - - /* mark things as done already if it would be impossible to have a more expensive case */ - unsigned colored_done = lodepng_is_greyscale_type(mode_in) ? 1 : 0; - unsigned alpha_done = lodepng_can_have_alpha(mode_in) ? 0 : 1; - unsigned numcolors_done = 0; - unsigned bpp = lodepng_get_bpp(mode_in); - unsigned bits_done = (stats->bits == 1 && bpp == 1) ? 1 : 0; - unsigned sixteen = 0; /* whether the input image is 16 bit */ - unsigned maxnumcolors = 257; - if(bpp <= 8) maxnumcolors = LODEPNG_MIN(257, stats->numcolors + (1u << bpp)); - - stats->numpixels += numpixels; - - /*if palette not allowed, no need to compute numcolors*/ - if(!stats->allow_palette) numcolors_done = 1; - - color_tree_init(&tree); - - /*If the stats was already filled in from previous data, fill its palette in tree - and mark things as done already if we know they are the most expensive case already*/ - if(stats->alpha) alpha_done = 1; - if(stats->colored) colored_done = 1; - if(stats->bits == 16) numcolors_done = 1; - if(stats->bits >= bpp) bits_done = 1; - if(stats->numcolors >= maxnumcolors) numcolors_done = 1; - - if(!numcolors_done) { - for(i = 0; i < stats->numcolors; i++) { - const unsigned char* color = &stats->palette[i * 4]; - error = color_tree_add(&tree, color[0], color[1], color[2], color[3], i); - if(error) goto cleanup; - } - } - - /*Check if the 16-bit input is truly 16-bit*/ - if(mode_in->bitdepth == 16 && !sixteen) { - unsigned short r = 0, g = 0, b = 0, a = 0; - for(i = 0; i != numpixels; ++i) { - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); - if((r & 255) != ((r >> 8) & 255) || (g & 255) != ((g >> 8) & 255) || - (b & 255) != ((b >> 8) & 255) || (a & 255) != ((a >> 8) & 255)) /*first and second byte differ*/ { - stats->bits = 16; - sixteen = 1; - bits_done = 1; - numcolors_done = 1; /*counting colors no longer useful, palette doesn't support 16-bit*/ - break; - } - } - } - - if(sixteen) { - unsigned short r = 0, g = 0, b = 0, a = 0; - - for(i = 0; i != numpixels; ++i) { - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); - - if(!colored_done && (r != g || r != b)) { - stats->colored = 1; - colored_done = 1; - } - - if(!alpha_done) { - unsigned matchkey = (r == stats->key_r && g == stats->key_g && b == stats->key_b); - if(a != 65535 && (a != 0 || (stats->key && !matchkey))) { - stats->alpha = 1; - stats->key = 0; - alpha_done = 1; - } else if(a == 0 && !stats->alpha && !stats->key) { - stats->key = 1; - stats->key_r = r; - stats->key_g = g; - stats->key_b = b; - } else if(a == 65535 && stats->key && matchkey) { - /* Color key cannot be used if an opaque pixel also has that RGB color. */ - stats->alpha = 1; - stats->key = 0; - alpha_done = 1; - } - } - if(alpha_done && numcolors_done && colored_done && bits_done) break; - } - - if(stats->key && !stats->alpha) { - for(i = 0; i != numpixels; ++i) { - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); - if(a != 0 && r == stats->key_r && g == stats->key_g && b == stats->key_b) { - /* Color key cannot be used if an opaque pixel also has that RGB color. */ - stats->alpha = 1; - stats->key = 0; - alpha_done = 1; - } - } - } - } else /* < 16-bit */ { - unsigned char r = 0, g = 0, b = 0, a = 0; - for(i = 0; i != numpixels; ++i) { - getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); - - if(!bits_done && stats->bits < 8) { - /*only r is checked, < 8 bits is only relevant for grayscale*/ - unsigned bits = getValueRequiredBits(r); - if(bits > stats->bits) stats->bits = bits; - } - bits_done = (stats->bits >= bpp); - - if(!colored_done && (r != g || r != b)) { - stats->colored = 1; - colored_done = 1; - if(stats->bits < 8) stats->bits = 8; /*PNG has no colored modes with less than 8-bit per channel*/ - } - - if(!alpha_done) { - unsigned matchkey = (r == stats->key_r && g == stats->key_g && b == stats->key_b); - if(a != 255 && (a != 0 || (stats->key && !matchkey))) { - stats->alpha = 1; - stats->key = 0; - alpha_done = 1; - if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ - } else if(a == 0 && !stats->alpha && !stats->key) { - stats->key = 1; - stats->key_r = r; - stats->key_g = g; - stats->key_b = b; - } else if(a == 255 && stats->key && matchkey) { - /* Color key cannot be used if an opaque pixel also has that RGB color. */ - stats->alpha = 1; - stats->key = 0; - alpha_done = 1; - if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ - } - } - - if(!numcolors_done) { - if(!color_tree_has(&tree, r, g, b, a)) { - error = color_tree_add(&tree, r, g, b, a, stats->numcolors); - if(error) goto cleanup; - if(stats->numcolors < 256) { - unsigned char* p = stats->palette; - unsigned n = stats->numcolors; - p[n * 4 + 0] = r; - p[n * 4 + 1] = g; - p[n * 4 + 2] = b; - p[n * 4 + 3] = a; - } - ++stats->numcolors; - numcolors_done = stats->numcolors >= maxnumcolors; - } - } - - if(alpha_done && numcolors_done && colored_done && bits_done) break; - } - - if(stats->key && !stats->alpha) { - for(i = 0; i != numpixels; ++i) { - getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); - if(a != 0 && r == stats->key_r && g == stats->key_g && b == stats->key_b) { - /* Color key cannot be used if an opaque pixel also has that RGB color. */ - stats->alpha = 1; - stats->key = 0; - alpha_done = 1; - if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ - } - } - } - - /*make the stats's key always 16-bit for consistency - repeat each byte twice*/ - stats->key_r += (stats->key_r << 8); - stats->key_g += (stats->key_g << 8); - stats->key_b += (stats->key_b << 8); - } - -cleanup: - color_tree_cleanup(&tree); - return error; -} - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -/*Adds a single color to the color stats. The stats must already have been inited. The color must be given as 16-bit -(with 2 bytes repeating for 8-bit and 65535 for opaque alpha channel). This function is expensive, do not call it for -all pixels of an image but only for a few additional values. */ -static unsigned lodepng_color_stats_add(LodePNGColorStats* stats, - unsigned r, unsigned g, unsigned b, unsigned a) { - unsigned error = 0; - unsigned char image[8]; - LodePNGColorMode mode; - lodepng_color_mode_init(&mode); - image[0] = r >> 8; image[1] = r; image[2] = g >> 8; image[3] = g; - image[4] = b >> 8; image[5] = b; image[6] = a >> 8; image[7] = a; - mode.bitdepth = 16; - mode.colortype = LCT_RGBA; - error = lodepng_compute_color_stats(stats, image, 1, 1, &mode); - lodepng_color_mode_cleanup(&mode); - return error; -} -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -/*Computes a minimal PNG color model that can contain all colors as indicated by the stats. -The stats should be computed with lodepng_compute_color_stats. -mode_in is raw color profile of the image the stats were computed on, to copy palette order from when relevant. -Minimal PNG color model means the color type and bit depth that gives smallest amount of bits in the output image, -e.g. gray if only grayscale pixels, palette if less than 256 colors, color key if only single transparent color, ... -This is used if auto_convert is enabled (it is by default). -*/ -static unsigned auto_choose_color(LodePNGColorMode* mode_out, - const LodePNGColorMode* mode_in, - const LodePNGColorStats* stats) { - unsigned error = 0; - unsigned palettebits; - size_t i, n; - size_t numpixels = stats->numpixels; - unsigned palette_ok, gray_ok; - - unsigned alpha = stats->alpha; - unsigned key = stats->key; - unsigned bits = stats->bits; - - mode_out->key_defined = 0; - - if(key && numpixels <= 16) { - alpha = 1; /*too few pixels to justify tRNS chunk overhead*/ - key = 0; - if(bits < 8) bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ - } - - gray_ok = !stats->colored; - if(!stats->allow_greyscale) gray_ok = 0; - if(!gray_ok && bits < 8) bits = 8; - - n = stats->numcolors; - palettebits = n <= 2 ? 1 : (n <= 4 ? 2 : (n <= 16 ? 4 : 8)); - palette_ok = n <= 256 && bits <= 8 && n != 0; /*n==0 means likely numcolors wasn't computed*/ - if(numpixels < n * 2) palette_ok = 0; /*don't add palette overhead if image has only a few pixels*/ - if(gray_ok && !alpha && bits <= palettebits) palette_ok = 0; /*gray is less overhead*/ - if(!stats->allow_palette) palette_ok = 0; - - if(palette_ok) { - const unsigned char* p = stats->palette; - lodepng_palette_clear(mode_out); /*remove potential earlier palette*/ - for(i = 0; i != stats->numcolors; ++i) { - error = lodepng_palette_add(mode_out, p[i * 4 + 0], p[i * 4 + 1], p[i * 4 + 2], p[i * 4 + 3]); - if(error) break; - } - - mode_out->colortype = LCT_PALETTE; - mode_out->bitdepth = palettebits; - - if(mode_in->colortype == LCT_PALETTE && mode_in->palettesize >= mode_out->palettesize - && mode_in->bitdepth == mode_out->bitdepth) { - /*If input should have same palette colors, keep original to preserve its order and prevent conversion*/ - lodepng_color_mode_cleanup(mode_out); - lodepng_color_mode_copy(mode_out, mode_in); - } - } else /*8-bit or 16-bit per channel*/ { - mode_out->bitdepth = bits; - mode_out->colortype = alpha ? (gray_ok ? LCT_GREY_ALPHA : LCT_RGBA) - : (gray_ok ? LCT_GREY : LCT_RGB); - if(key) { - unsigned mask = (1u << mode_out->bitdepth) - 1u; /*stats always uses 16-bit, mask converts it*/ - mode_out->key_r = stats->key_r & mask; - mode_out->key_g = stats->key_g & mask; - mode_out->key_b = stats->key_b & mask; - mode_out->key_defined = 1; - } - } - - return error; -} - -#endif /* #ifdef LODEPNG_COMPILE_ENCODER */ - -/* -Paeth predictor, used by PNG filter type 4 -The parameters are of type short, but should come from unsigned chars, the shorts -are only needed to make the paeth calculation correct. -*/ -static unsigned char paethPredictor(short a, short b, short c) { - short pa = LODEPNG_ABS(b - c); - short pb = LODEPNG_ABS(a - c); - short pc = LODEPNG_ABS(a + b - c - c); - /* return input value associated with smallest of pa, pb, pc (with certain priority if equal) */ - if(pb < pa) { a = b; pa = pb; } - return (pc < pa) ? c : a; -} - -/*shared values used by multiple Adam7 related functions*/ - -static const unsigned ADAM7_IX[7] = { 0, 4, 0, 2, 0, 1, 0 }; /*x start values*/ -static const unsigned ADAM7_IY[7] = { 0, 0, 4, 0, 2, 0, 1 }; /*y start values*/ -static const unsigned ADAM7_DX[7] = { 8, 8, 4, 4, 2, 2, 1 }; /*x delta values*/ -static const unsigned ADAM7_DY[7] = { 8, 8, 8, 4, 4, 2, 2 }; /*y delta values*/ - -/* -Outputs various dimensions and positions in the image related to the Adam7 reduced images. -passw: output containing the width of the 7 passes -passh: output containing the height of the 7 passes -filter_passstart: output containing the index of the start and end of each - reduced image with filter bytes -padded_passstart output containing the index of the start and end of each - reduced image when without filter bytes but with padded scanlines -passstart: output containing the index of the start and end of each reduced - image without padding between scanlines, but still padding between the images -w, h: width and height of non-interlaced image -bpp: bits per pixel -"padded" is only relevant if bpp is less than 8 and a scanline or image does not - end at a full byte -*/ -static void Adam7_getpassvalues(unsigned passw[7], unsigned passh[7], size_t filter_passstart[8], - size_t padded_passstart[8], size_t passstart[8], unsigned w, unsigned h, unsigned bpp) { - /*the passstart values have 8 values: the 8th one indicates the byte after the end of the 7th (= last) pass*/ - unsigned i; - - /*calculate width and height in pixels of each pass*/ - for(i = 0; i != 7; ++i) { - passw[i] = (w + ADAM7_DX[i] - ADAM7_IX[i] - 1) / ADAM7_DX[i]; - passh[i] = (h + ADAM7_DY[i] - ADAM7_IY[i] - 1) / ADAM7_DY[i]; - if(passw[i] == 0) passh[i] = 0; - if(passh[i] == 0) passw[i] = 0; - } - - filter_passstart[0] = padded_passstart[0] = passstart[0] = 0; - for(i = 0; i != 7; ++i) { - /*if passw[i] is 0, it's 0 bytes, not 1 (no filtertype-byte)*/ - filter_passstart[i + 1] = filter_passstart[i] - + ((passw[i] && passh[i]) ? passh[i] * (1u + (passw[i] * bpp + 7u) / 8u) : 0); - /*bits padded if needed to fill full byte at end of each scanline*/ - padded_passstart[i + 1] = padded_passstart[i] + passh[i] * ((passw[i] * bpp + 7u) / 8u); - /*only padded at end of reduced image*/ - passstart[i + 1] = passstart[i] + (passh[i] * passw[i] * bpp + 7u) / 8u; - } -} - -#ifdef LODEPNG_COMPILE_DECODER - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / PNG Decoder / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/*read the information from the header and store it in the LodePNGInfo. return value is error*/ -unsigned lodepng_inspect(unsigned* w, unsigned* h, LodePNGState* state, - const unsigned char* in, size_t insize) { - unsigned width, height; - LodePNGInfo* info = &state->info_png; - if(insize == 0 || in == 0) { - CERROR_RETURN_ERROR(state->error, 48); /*error: the given data is empty*/ - } - if(insize < 33) { - CERROR_RETURN_ERROR(state->error, 27); /*error: the data length is smaller than the length of a PNG header*/ - } - - /*when decoding a new PNG image, make sure all parameters created after previous decoding are reset*/ - /* TODO: remove this. One should use a new LodePNGState for new sessions */ - lodepng_info_cleanup(info); - lodepng_info_init(info); - - if(in[0] != 137 || in[1] != 80 || in[2] != 78 || in[3] != 71 - || in[4] != 13 || in[5] != 10 || in[6] != 26 || in[7] != 10) { - CERROR_RETURN_ERROR(state->error, 28); /*error: the first 8 bytes are not the correct PNG signature*/ - } - if(lodepng_chunk_length(in + 8) != 13) { - CERROR_RETURN_ERROR(state->error, 94); /*error: header size must be 13 bytes*/ - } - if(!lodepng_chunk_type_equals(in + 8, "IHDR")) { - CERROR_RETURN_ERROR(state->error, 29); /*error: it doesn't start with a IHDR chunk!*/ - } - - /*read the values given in the header*/ - width = lodepng_read32bitInt(&in[16]); - height = lodepng_read32bitInt(&in[20]); - /*TODO: remove the undocumented feature that allows to give null pointers to width or height*/ - if(w) *w = width; - if(h) *h = height; - info->color.bitdepth = in[24]; - info->color.colortype = (LodePNGColorType)in[25]; - info->compression_method = in[26]; - info->filter_method = in[27]; - info->interlace_method = in[28]; - - /*errors returned only after the parsing so other values are still output*/ - - /*error: invalid image size*/ - if(width == 0 || height == 0) CERROR_RETURN_ERROR(state->error, 93); - /*error: invalid colortype or bitdepth combination*/ - state->error = checkColorValidity(info->color.colortype, info->color.bitdepth); - if(state->error) return state->error; - /*error: only compression method 0 is allowed in the specification*/ - if(info->compression_method != 0) CERROR_RETURN_ERROR(state->error, 32); - /*error: only filter method 0 is allowed in the specification*/ - if(info->filter_method != 0) CERROR_RETURN_ERROR(state->error, 33); - /*error: only interlace methods 0 and 1 exist in the specification*/ - if(info->interlace_method > 1) CERROR_RETURN_ERROR(state->error, 34); - - if(!state->decoder.ignore_crc) { - unsigned CRC = lodepng_read32bitInt(&in[29]); - unsigned checksum = lodepng_crc32(&in[12], 17); - if(CRC != checksum) { - CERROR_RETURN_ERROR(state->error, 57); /*invalid CRC*/ - } - } - - return state->error; -} - -static unsigned unfilterScanline(unsigned char* recon, const unsigned char* scanline, const unsigned char* precon, - size_t bytewidth, unsigned char filterType, size_t length) { - /* - For PNG filter method 0 - unfilter a PNG image scanline by scanline. when the pixels are smaller than 1 byte, - the filter works byte per byte (bytewidth = 1) - precon is the previous unfiltered scanline, recon the result, scanline the current one - the incoming scanlines do NOT include the filtertype byte, that one is given in the parameter filterType instead - recon and scanline MAY be the same memory address! precon must be disjoint. - */ - - size_t i; - switch(filterType) { - case 0: - for(i = 0; i != length; ++i) recon[i] = scanline[i]; - break; - case 1: { - size_t j = 0; - for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i]; - for(i = bytewidth; i != length; ++i, ++j) recon[i] = scanline[i] + recon[j]; - break; - } - case 2: - if(precon) { - for(i = 0; i != length; ++i) recon[i] = scanline[i] + precon[i]; - } else { - for(i = 0; i != length; ++i) recon[i] = scanline[i]; - } - break; - case 3: - if(precon) { - size_t j = 0; - for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i] + (precon[i] >> 1u); - /* Unroll independent paths of this predictor. A 6x and 8x version is also possible but that adds - too much code. Whether this speeds up anything depends on compiler and settings. */ - if(bytewidth >= 4) { - for(; i + 3 < length; i += 4, j += 4) { - unsigned char s0 = scanline[i + 0], r0 = recon[j + 0], p0 = precon[i + 0]; - unsigned char s1 = scanline[i + 1], r1 = recon[j + 1], p1 = precon[i + 1]; - unsigned char s2 = scanline[i + 2], r2 = recon[j + 2], p2 = precon[i + 2]; - unsigned char s3 = scanline[i + 3], r3 = recon[j + 3], p3 = precon[i + 3]; - recon[i + 0] = s0 + ((r0 + p0) >> 1u); - recon[i + 1] = s1 + ((r1 + p1) >> 1u); - recon[i + 2] = s2 + ((r2 + p2) >> 1u); - recon[i + 3] = s3 + ((r3 + p3) >> 1u); - } - } else if(bytewidth >= 3) { - for(; i + 2 < length; i += 3, j += 3) { - unsigned char s0 = scanline[i + 0], r0 = recon[j + 0], p0 = precon[i + 0]; - unsigned char s1 = scanline[i + 1], r1 = recon[j + 1], p1 = precon[i + 1]; - unsigned char s2 = scanline[i + 2], r2 = recon[j + 2], p2 = precon[i + 2]; - recon[i + 0] = s0 + ((r0 + p0) >> 1u); - recon[i + 1] = s1 + ((r1 + p1) >> 1u); - recon[i + 2] = s2 + ((r2 + p2) >> 1u); - } - } else if(bytewidth >= 2) { - for(; i + 1 < length; i += 2, j += 2) { - unsigned char s0 = scanline[i + 0], r0 = recon[j + 0], p0 = precon[i + 0]; - unsigned char s1 = scanline[i + 1], r1 = recon[j + 1], p1 = precon[i + 1]; - recon[i + 0] = s0 + ((r0 + p0) >> 1u); - recon[i + 1] = s1 + ((r1 + p1) >> 1u); - } - } - for(; i != length; ++i, ++j) recon[i] = scanline[i] + ((recon[j] + precon[i]) >> 1u); - } else { - size_t j = 0; - for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i]; - for(i = bytewidth; i != length; ++i, ++j) recon[i] = scanline[i] + (recon[j] >> 1u); - } - break; - case 4: - if(precon) { - size_t j = 0; - for(i = 0; i != bytewidth; ++i) { - recon[i] = (scanline[i] + precon[i]); /*paethPredictor(0, precon[i], 0) is always precon[i]*/ - } - - /* Unroll independent paths of the paeth predictor. A 6x and 8x version is also possible but that - adds too much code. Whether this speeds up anything depends on compiler and settings. */ - if(bytewidth >= 4) { - for(; i + 3 < length; i += 4, j += 4) { - unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1], s2 = scanline[i + 2], s3 = scanline[i + 3]; - unsigned char r0 = recon[j + 0], r1 = recon[j + 1], r2 = recon[j + 2], r3 = recon[j + 3]; - unsigned char p0 = precon[i + 0], p1 = precon[i + 1], p2 = precon[i + 2], p3 = precon[i + 3]; - unsigned char q0 = precon[j + 0], q1 = precon[j + 1], q2 = precon[j + 2], q3 = precon[j + 3]; - recon[i + 0] = s0 + paethPredictor(r0, p0, q0); - recon[i + 1] = s1 + paethPredictor(r1, p1, q1); - recon[i + 2] = s2 + paethPredictor(r2, p2, q2); - recon[i + 3] = s3 + paethPredictor(r3, p3, q3); - } - } else if(bytewidth >= 3) { - for(; i + 2 < length; i += 3, j += 3) { - unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1], s2 = scanline[i + 2]; - unsigned char r0 = recon[j + 0], r1 = recon[j + 1], r2 = recon[j + 2]; - unsigned char p0 = precon[i + 0], p1 = precon[i + 1], p2 = precon[i + 2]; - unsigned char q0 = precon[j + 0], q1 = precon[j + 1], q2 = precon[j + 2]; - recon[i + 0] = s0 + paethPredictor(r0, p0, q0); - recon[i + 1] = s1 + paethPredictor(r1, p1, q1); - recon[i + 2] = s2 + paethPredictor(r2, p2, q2); - } - } else if(bytewidth >= 2) { - for(; i + 1 < length; i += 2, j += 2) { - unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1]; - unsigned char r0 = recon[j + 0], r1 = recon[j + 1]; - unsigned char p0 = precon[i + 0], p1 = precon[i + 1]; - unsigned char q0 = precon[j + 0], q1 = precon[j + 1]; - recon[i + 0] = s0 + paethPredictor(r0, p0, q0); - recon[i + 1] = s1 + paethPredictor(r1, p1, q1); - } - } - - for(; i != length; ++i, ++j) { - recon[i] = (scanline[i] + paethPredictor(recon[i - bytewidth], precon[i], precon[j])); - } - } else { - size_t j = 0; - for(i = 0; i != bytewidth; ++i) { - recon[i] = scanline[i]; - } - for(i = bytewidth; i != length; ++i, ++j) { - /*paethPredictor(recon[i - bytewidth], 0, 0) is always recon[i - bytewidth]*/ - recon[i] = (scanline[i] + recon[j]); - } - } - break; - default: return 36; /*error: invalid filter type given*/ - } - return 0; -} - -static unsigned unfilter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) { - /* - For PNG filter method 0 - this function unfilters a single image (e.g. without interlacing this is called once, with Adam7 seven times) - out must have enough bytes allocated already, in must have the scanlines + 1 filtertype byte per scanline - w and h are image dimensions or dimensions of reduced image, bpp is bits per pixel - in and out are allowed to be the same memory address (but aren't the same size since in has the extra filter bytes) - */ - - unsigned y; - unsigned char* prevline = 0; - - /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/ - size_t bytewidth = (bpp + 7u) / 8u; - /*the width of a scanline in bytes, not including the filter type*/ - size_t linebytes = lodepng_get_raw_size_idat(w, 1, bpp) - 1u; - - for(y = 0; y < h; ++y) { - size_t outindex = linebytes * y; - size_t inindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ - unsigned char filterType = in[inindex]; - - CERROR_TRY_RETURN(unfilterScanline(&out[outindex], &in[inindex + 1], prevline, bytewidth, filterType, linebytes)); - - prevline = &out[outindex]; - } - - return 0; -} - -/* -in: Adam7 interlaced image, with no padding bits between scanlines, but between - reduced images so that each reduced image starts at a byte. -out: the same pixels, but re-ordered so that they're now a non-interlaced image with size w*h -bpp: bits per pixel -out has the following size in bits: w * h * bpp. -in is possibly bigger due to padding bits between reduced images. -out must be big enough AND must be 0 everywhere if bpp < 8 in the current implementation -(because that's likely a little bit faster) -NOTE: comments about padding bits are only relevant if bpp < 8 -*/ -static void Adam7_deinterlace(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) { - unsigned passw[7], passh[7]; - size_t filter_passstart[8], padded_passstart[8], passstart[8]; - unsigned i; - - Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - - if(bpp >= 8) { - for(i = 0; i != 7; ++i) { - unsigned x, y, b; - size_t bytewidth = bpp / 8u; - for(y = 0; y < passh[i]; ++y) - for(x = 0; x < passw[i]; ++x) { - size_t pixelinstart = passstart[i] + (y * passw[i] + x) * bytewidth; - size_t pixeloutstart = ((ADAM7_IY[i] + (size_t)y * ADAM7_DY[i]) * (size_t)w - + ADAM7_IX[i] + (size_t)x * ADAM7_DX[i]) * bytewidth; - for(b = 0; b < bytewidth; ++b) { - out[pixeloutstart + b] = in[pixelinstart + b]; - } - } - } - } else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ { - for(i = 0; i != 7; ++i) { - unsigned x, y, b; - unsigned ilinebits = bpp * passw[i]; - unsigned olinebits = bpp * w; - size_t obp, ibp; /*bit pointers (for out and in buffer)*/ - for(y = 0; y < passh[i]; ++y) - for(x = 0; x < passw[i]; ++x) { - ibp = (8 * passstart[i]) + (y * ilinebits + x * bpp); - obp = (ADAM7_IY[i] + (size_t)y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + (size_t)x * ADAM7_DX[i]) * bpp; - for(b = 0; b < bpp; ++b) { - unsigned char bit = readBitFromReversedStream(&ibp, in); - setBitOfReversedStream(&obp, out, bit); - } - } - } - } -} - -static void removePaddingBits(unsigned char* out, const unsigned char* in, - size_t olinebits, size_t ilinebits, unsigned h) { - /* - After filtering there are still padding bits if scanlines have non multiple of 8 bit amounts. They need - to be removed (except at last scanline of (Adam7-reduced) image) before working with pure image buffers - for the Adam7 code, the color convert code and the output to the user. - in and out are allowed to be the same buffer, in may also be higher but still overlapping; in must - have >= ilinebits*h bits, out must have >= olinebits*h bits, olinebits must be <= ilinebits - also used to move bits after earlier such operations happened, e.g. in a sequence of reduced images from Adam7 - only useful if (ilinebits - olinebits) is a value in the range 1..7 - */ - unsigned y; - size_t diff = ilinebits - olinebits; - size_t ibp = 0, obp = 0; /*input and output bit pointers*/ - for(y = 0; y < h; ++y) { - size_t x; - for(x = 0; x < olinebits; ++x) { - unsigned char bit = readBitFromReversedStream(&ibp, in); - setBitOfReversedStream(&obp, out, bit); - } - ibp += diff; - } -} - -/*out must be buffer big enough to contain full image, and in must contain the full decompressed data from -the IDAT chunks (with filter index bytes and possible padding bits) -return value is error*/ -static unsigned postProcessScanlines(unsigned char* out, unsigned char* in, - unsigned w, unsigned h, const LodePNGInfo* info_png) { - /* - This function converts the filtered-padded-interlaced data into pure 2D image buffer with the PNG's colortype. - Steps: - *) if no Adam7: 1) unfilter 2) remove padding bits (= possible extra bits per scanline if bpp < 8) - *) if adam7: 1) 7x unfilter 2) 7x remove padding bits 3) Adam7_deinterlace - NOTE: the in buffer will be overwritten with intermediate data! - */ - unsigned bpp = lodepng_get_bpp(&info_png->color); - if(bpp == 0) return 31; /*error: invalid colortype*/ - - if(info_png->interlace_method == 0) { - if(bpp < 8 && w * bpp != ((w * bpp + 7u) / 8u) * 8u) { - CERROR_TRY_RETURN(unfilter(in, in, w, h, bpp)); - removePaddingBits(out, in, w * bpp, ((w * bpp + 7u) / 8u) * 8u, h); - } - /*we can immediately filter into the out buffer, no other steps needed*/ - else CERROR_TRY_RETURN(unfilter(out, in, w, h, bpp)); - } else /*interlace_method is 1 (Adam7)*/ { - unsigned passw[7], passh[7]; size_t filter_passstart[8], padded_passstart[8], passstart[8]; - unsigned i; - - Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - - for(i = 0; i != 7; ++i) { - CERROR_TRY_RETURN(unfilter(&in[padded_passstart[i]], &in[filter_passstart[i]], passw[i], passh[i], bpp)); - /*TODO: possible efficiency improvement: if in this reduced image the bits fit nicely in 1 scanline, - move bytes instead of bits or move not at all*/ - if(bpp < 8) { - /*remove padding bits in scanlines; after this there still may be padding - bits between the different reduced images: each reduced image still starts nicely at a byte*/ - removePaddingBits(&in[passstart[i]], &in[padded_passstart[i]], passw[i] * bpp, - ((passw[i] * bpp + 7u) / 8u) * 8u, passh[i]); - } - } - - Adam7_deinterlace(out, in, w, h, bpp); - } - - return 0; -} - -static unsigned readChunk_PLTE(LodePNGColorMode* color, const unsigned char* data, size_t chunkLength) { - unsigned pos = 0, i; - color->palettesize = chunkLength / 3u; - if(color->palettesize == 0 || color->palettesize > 256) return 38; /*error: palette too small or big*/ - lodepng_color_mode_alloc_palette(color); - if(!color->palette && color->palettesize) { - color->palettesize = 0; - return 83; /*alloc fail*/ - } - - for(i = 0; i != color->palettesize; ++i) { - color->palette[4 * i + 0] = data[pos++]; /*R*/ - color->palette[4 * i + 1] = data[pos++]; /*G*/ - color->palette[4 * i + 2] = data[pos++]; /*B*/ - color->palette[4 * i + 3] = 255; /*alpha*/ - } - - return 0; /* OK */ -} - -static unsigned readChunk_tRNS(LodePNGColorMode* color, const unsigned char* data, size_t chunkLength) { - unsigned i; - if(color->colortype == LCT_PALETTE) { - /*error: more alpha values given than there are palette entries*/ - if(chunkLength > color->palettesize) return 39; - - for(i = 0; i != chunkLength; ++i) color->palette[4 * i + 3] = data[i]; - } else if(color->colortype == LCT_GREY) { - /*error: this chunk must be 2 bytes for grayscale image*/ - if(chunkLength != 2) return 30; - - color->key_defined = 1; - color->key_r = color->key_g = color->key_b = 256u * data[0] + data[1]; - } else if(color->colortype == LCT_RGB) { - /*error: this chunk must be 6 bytes for RGB image*/ - if(chunkLength != 6) return 41; - - color->key_defined = 1; - color->key_r = 256u * data[0] + data[1]; - color->key_g = 256u * data[2] + data[3]; - color->key_b = 256u * data[4] + data[5]; - } - else return 42; /*error: tRNS chunk not allowed for other color models*/ - - return 0; /* OK */ -} - - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -/*background color chunk (bKGD)*/ -static unsigned readChunk_bKGD(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - if(info->color.colortype == LCT_PALETTE) { - /*error: this chunk must be 1 byte for indexed color image*/ - if(chunkLength != 1) return 43; - - /*error: invalid palette index, or maybe this chunk appeared before PLTE*/ - if(data[0] >= info->color.palettesize) return 103; - - info->background_defined = 1; - info->background_r = info->background_g = info->background_b = data[0]; - } else if(info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) { - /*error: this chunk must be 2 bytes for grayscale image*/ - if(chunkLength != 2) return 44; - - /*the values are truncated to bitdepth in the PNG file*/ - info->background_defined = 1; - info->background_r = info->background_g = info->background_b = 256u * data[0] + data[1]; - } else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) { - /*error: this chunk must be 6 bytes for grayscale image*/ - if(chunkLength != 6) return 45; - - /*the values are truncated to bitdepth in the PNG file*/ - info->background_defined = 1; - info->background_r = 256u * data[0] + data[1]; - info->background_g = 256u * data[2] + data[3]; - info->background_b = 256u * data[4] + data[5]; - } - - return 0; /* OK */ -} - -/*text chunk (tEXt)*/ -static unsigned readChunk_tEXt(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - unsigned error = 0; - char *key = 0, *str = 0; - - while(!error) /*not really a while loop, only used to break on error*/ { - unsigned length, string2_begin; - - length = 0; - while(length < chunkLength && data[length] != 0) ++length; - /*even though it's not allowed by the standard, no error is thrown if - there's no null termination char, if the text is empty*/ - if(length < 1 || length > 79) CERROR_BREAK(error, 89); /*keyword too short or long*/ - - key = (char*)lodepng_malloc(length + 1); - if(!key) CERROR_BREAK(error, 83); /*alloc fail*/ - - lodepng_memcpy(key, data, length); - key[length] = 0; - - string2_begin = length + 1; /*skip keyword null terminator*/ - - length = (unsigned)(chunkLength < string2_begin ? 0 : chunkLength - string2_begin); - str = (char*)lodepng_malloc(length + 1); - if(!str) CERROR_BREAK(error, 83); /*alloc fail*/ - - lodepng_memcpy(str, data + string2_begin, length); - str[length] = 0; - - error = lodepng_add_text(info, key, str); - - break; - } - - lodepng_free(key); - lodepng_free(str); - - return error; -} - -/*compressed text chunk (zTXt)*/ -static unsigned readChunk_zTXt(LodePNGInfo* info, const LodePNGDecoderSettings* decoder, - const unsigned char* data, size_t chunkLength) { - unsigned error = 0; - - /*copy the object to change parameters in it*/ - LodePNGDecompressSettings zlibsettings = decoder->zlibsettings; - - unsigned length, string2_begin; - char *key = 0; - unsigned char* str = 0; - size_t size = 0; - - while(!error) /*not really a while loop, only used to break on error*/ { - for(length = 0; length < chunkLength && data[length] != 0; ++length) ; - if(length + 2 >= chunkLength) CERROR_BREAK(error, 75); /*no null termination, corrupt?*/ - if(length < 1 || length > 79) CERROR_BREAK(error, 89); /*keyword too short or long*/ - - key = (char*)lodepng_malloc(length + 1); - if(!key) CERROR_BREAK(error, 83); /*alloc fail*/ - - lodepng_memcpy(key, data, length); - key[length] = 0; - - if(data[length + 1] != 0) CERROR_BREAK(error, 72); /*the 0 byte indicating compression must be 0*/ - - string2_begin = length + 2; - if(string2_begin > chunkLength) CERROR_BREAK(error, 75); /*no null termination, corrupt?*/ - - length = (unsigned)chunkLength - string2_begin; - zlibsettings.max_output_size = decoder->max_text_size; - /*will fail if zlib error, e.g. if length is too small*/ - error = zlib_decompress(&str, &size, 0, &data[string2_begin], - length, &zlibsettings); - /*error: compressed text larger than decoder->max_text_size*/ - if(error && size > zlibsettings.max_output_size) error = 112; - if(error) break; - error = lodepng_add_text_sized(info, key, (char*)str, size); - break; - } - - lodepng_free(key); - lodepng_free(str); - - return error; -} - -/*international text chunk (iTXt)*/ -static unsigned readChunk_iTXt(LodePNGInfo* info, const LodePNGDecoderSettings* decoder, - const unsigned char* data, size_t chunkLength) { - unsigned error = 0; - unsigned i; - - /*copy the object to change parameters in it*/ - LodePNGDecompressSettings zlibsettings = decoder->zlibsettings; - - unsigned length, begin, compressed; - char *key = 0, *langtag = 0, *transkey = 0; - - while(!error) /*not really a while loop, only used to break on error*/ { - /*Quick check if the chunk length isn't too small. Even without check - it'd still fail with other error checks below if it's too short. This just gives a different error code.*/ - if(chunkLength < 5) CERROR_BREAK(error, 30); /*iTXt chunk too short*/ - - /*read the key*/ - for(length = 0; length < chunkLength && data[length] != 0; ++length) ; - if(length + 3 >= chunkLength) CERROR_BREAK(error, 75); /*no null termination char, corrupt?*/ - if(length < 1 || length > 79) CERROR_BREAK(error, 89); /*keyword too short or long*/ - - key = (char*)lodepng_malloc(length + 1); - if(!key) CERROR_BREAK(error, 83); /*alloc fail*/ - - lodepng_memcpy(key, data, length); - key[length] = 0; - - /*read the compression method*/ - compressed = data[length + 1]; - if(data[length + 2] != 0) CERROR_BREAK(error, 72); /*the 0 byte indicating compression must be 0*/ - - /*even though it's not allowed by the standard, no error is thrown if - there's no null termination char, if the text is empty for the next 3 texts*/ - - /*read the langtag*/ - begin = length + 3; - length = 0; - for(i = begin; i < chunkLength && data[i] != 0; ++i) ++length; - - langtag = (char*)lodepng_malloc(length + 1); - if(!langtag) CERROR_BREAK(error, 83); /*alloc fail*/ - - lodepng_memcpy(langtag, data + begin, length); - langtag[length] = 0; - - /*read the transkey*/ - begin += length + 1; - length = 0; - for(i = begin; i < chunkLength && data[i] != 0; ++i) ++length; - - transkey = (char*)lodepng_malloc(length + 1); - if(!transkey) CERROR_BREAK(error, 83); /*alloc fail*/ - - lodepng_memcpy(transkey, data + begin, length); - transkey[length] = 0; - - /*read the actual text*/ - begin += length + 1; - - length = (unsigned)chunkLength < begin ? 0 : (unsigned)chunkLength - begin; - - if(compressed) { - unsigned char* str = 0; - size_t size = 0; - zlibsettings.max_output_size = decoder->max_text_size; - /*will fail if zlib error, e.g. if length is too small*/ - error = zlib_decompress(&str, &size, 0, &data[begin], - length, &zlibsettings); - /*error: compressed text larger than decoder->max_text_size*/ - if(error && size > zlibsettings.max_output_size) error = 112; - if(!error) error = lodepng_add_itext_sized(info, key, langtag, transkey, (const char*)str, size); - lodepng_free(str); - } else { - error = lodepng_add_itext_sized(info, key, langtag, transkey, (const char*)(data + begin), length); - } - - break; - } - - lodepng_free(key); - lodepng_free(langtag); - lodepng_free(transkey); - - return error; -} - -static unsigned readChunk_tIME(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - if(chunkLength != 7) return 73; /*invalid tIME chunk size*/ - - info->time_defined = 1; - info->time.year = 256u * data[0] + data[1]; - info->time.month = data[2]; - info->time.day = data[3]; - info->time.hour = data[4]; - info->time.minute = data[5]; - info->time.second = data[6]; - - return 0; /* OK */ -} - -static unsigned readChunk_pHYs(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - if(chunkLength != 9) return 74; /*invalid pHYs chunk size*/ - - info->phys_defined = 1; - info->phys_x = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3]; - info->phys_y = 16777216u * data[4] + 65536u * data[5] + 256u * data[6] + data[7]; - info->phys_unit = data[8]; - - return 0; /* OK */ -} - -static unsigned readChunk_gAMA(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - if(chunkLength != 4) return 96; /*invalid gAMA chunk size*/ - - info->gama_defined = 1; - info->gama_gamma = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3]; - - return 0; /* OK */ -} - -static unsigned readChunk_cHRM(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - if(chunkLength != 32) return 97; /*invalid cHRM chunk size*/ - - info->chrm_defined = 1; - info->chrm_white_x = 16777216u * data[ 0] + 65536u * data[ 1] + 256u * data[ 2] + data[ 3]; - info->chrm_white_y = 16777216u * data[ 4] + 65536u * data[ 5] + 256u * data[ 6] + data[ 7]; - info->chrm_red_x = 16777216u * data[ 8] + 65536u * data[ 9] + 256u * data[10] + data[11]; - info->chrm_red_y = 16777216u * data[12] + 65536u * data[13] + 256u * data[14] + data[15]; - info->chrm_green_x = 16777216u * data[16] + 65536u * data[17] + 256u * data[18] + data[19]; - info->chrm_green_y = 16777216u * data[20] + 65536u * data[21] + 256u * data[22] + data[23]; - info->chrm_blue_x = 16777216u * data[24] + 65536u * data[25] + 256u * data[26] + data[27]; - info->chrm_blue_y = 16777216u * data[28] + 65536u * data[29] + 256u * data[30] + data[31]; - - return 0; /* OK */ -} - -static unsigned readChunk_sRGB(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - if(chunkLength != 1) return 98; /*invalid sRGB chunk size (this one is never ignored)*/ - - info->srgb_defined = 1; - info->srgb_intent = data[0]; - - return 0; /* OK */ -} - -static unsigned readChunk_iCCP(LodePNGInfo* info, const LodePNGDecoderSettings* decoder, - const unsigned char* data, size_t chunkLength) { - unsigned error = 0; - unsigned i; - size_t size = 0; - /*copy the object to change parameters in it*/ - LodePNGDecompressSettings zlibsettings = decoder->zlibsettings; - - unsigned length, string2_begin; - - info->iccp_defined = 1; - if(info->iccp_name) lodepng_clear_icc(info); - - for(length = 0; length < chunkLength && data[length] != 0; ++length) ; - if(length + 2 >= chunkLength) return 75; /*no null termination, corrupt?*/ - if(length < 1 || length > 79) return 89; /*keyword too short or long*/ - - info->iccp_name = (char*)lodepng_malloc(length + 1); - if(!info->iccp_name) return 83; /*alloc fail*/ - - info->iccp_name[length] = 0; - for(i = 0; i != length; ++i) info->iccp_name[i] = (char)data[i]; - - if(data[length + 1] != 0) return 72; /*the 0 byte indicating compression must be 0*/ - - string2_begin = length + 2; - if(string2_begin > chunkLength) return 75; /*no null termination, corrupt?*/ - - length = (unsigned)chunkLength - string2_begin; - zlibsettings.max_output_size = decoder->max_icc_size; - error = zlib_decompress(&info->iccp_profile, &size, 0, - &data[string2_begin], - length, &zlibsettings); - /*error: ICC profile larger than decoder->max_icc_size*/ - if(error && size > zlibsettings.max_output_size) error = 113; - info->iccp_profile_size = size; - if(!error && !info->iccp_profile_size) error = 100; /*invalid ICC profile size*/ - return error; -} -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -unsigned lodepng_inspect_chunk(LodePNGState* state, size_t pos, - const unsigned char* in, size_t insize) { - const unsigned char* chunk = in + pos; - unsigned chunkLength; - const unsigned char* data; - unsigned unhandled = 0; - unsigned error = 0; - - if(pos + 4 > insize) return 30; - chunkLength = lodepng_chunk_length(chunk); - if(chunkLength > 2147483647) return 63; - data = lodepng_chunk_data_const(chunk); - if(data + chunkLength + 4 > in + insize) return 30; - - if(lodepng_chunk_type_equals(chunk, "PLTE")) { - error = readChunk_PLTE(&state->info_png.color, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "tRNS")) { - error = readChunk_tRNS(&state->info_png.color, data, chunkLength); -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - } else if(lodepng_chunk_type_equals(chunk, "bKGD")) { - error = readChunk_bKGD(&state->info_png, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "tEXt")) { - error = readChunk_tEXt(&state->info_png, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "zTXt")) { - error = readChunk_zTXt(&state->info_png, &state->decoder, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "iTXt")) { - error = readChunk_iTXt(&state->info_png, &state->decoder, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "tIME")) { - error = readChunk_tIME(&state->info_png, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "pHYs")) { - error = readChunk_pHYs(&state->info_png, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "gAMA")) { - error = readChunk_gAMA(&state->info_png, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "cHRM")) { - error = readChunk_cHRM(&state->info_png, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "sRGB")) { - error = readChunk_sRGB(&state->info_png, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "iCCP")) { - error = readChunk_iCCP(&state->info_png, &state->decoder, data, chunkLength); -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } else { - /* unhandled chunk is ok (is not an error) */ - unhandled = 1; - } - - if(!error && !unhandled && !state->decoder.ignore_crc) { - if(lodepng_chunk_check_crc(chunk)) return 57; /*invalid CRC*/ - } - - return error; -} - -/*read a PNG, the result will be in the same color type as the PNG (hence "generic")*/ -static void decodeGeneric(unsigned char** out, unsigned* w, unsigned* h, - LodePNGState* state, - const unsigned char* in, size_t insize) { - unsigned char IEND = 0; - const unsigned char* chunk; - unsigned char* idat; /*the data from idat chunks, zlib compressed*/ - size_t idatsize = 0; - unsigned char* scanlines = 0; - size_t scanlines_size = 0, expected_size = 0; - size_t outsize = 0; - - /*for unknown chunk order*/ - unsigned unknown = 0; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - unsigned critical_pos = 1; /*1 = after IHDR, 2 = after PLTE, 3 = after IDAT*/ -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - - - /* safe output values in case error happens */ - *out = 0; - *w = *h = 0; - - state->error = lodepng_inspect(w, h, state, in, insize); /*reads header and resets other parameters in state->info_png*/ - if(state->error) return; - - if(lodepng_pixel_overflow(*w, *h, &state->info_png.color, &state->info_raw)) { - CERROR_RETURN(state->error, 92); /*overflow possible due to amount of pixels*/ - } - - /*the input filesize is a safe upper bound for the sum of idat chunks size*/ - idat = (unsigned char*)lodepng_malloc(insize); - if(!idat) CERROR_RETURN(state->error, 83); /*alloc fail*/ - - chunk = &in[33]; /*first byte of the first chunk after the header*/ - - /*loop through the chunks, ignoring unknown chunks and stopping at IEND chunk. - IDAT data is put at the start of the in buffer*/ - while(!IEND && !state->error) { - unsigned chunkLength; - const unsigned char* data; /*the data in the chunk*/ - - /*error: size of the in buffer too small to contain next chunk*/ - if((size_t)((chunk - in) + 12) > insize || chunk < in) { - if(state->decoder.ignore_end) break; /*other errors may still happen though*/ - CERROR_BREAK(state->error, 30); - } - - /*length of the data of the chunk, excluding the length bytes, chunk type and CRC bytes*/ - chunkLength = lodepng_chunk_length(chunk); - /*error: chunk length larger than the max PNG chunk size*/ - if(chunkLength > 2147483647) { - if(state->decoder.ignore_end) break; /*other errors may still happen though*/ - CERROR_BREAK(state->error, 63); - } - - if((size_t)((chunk - in) + chunkLength + 12) > insize || (chunk + chunkLength + 12) < in) { - CERROR_BREAK(state->error, 64); /*error: size of the in buffer too small to contain next chunk*/ - } - - data = lodepng_chunk_data_const(chunk); - - unknown = 0; - - /*IDAT chunk, containing compressed image data*/ - if(lodepng_chunk_type_equals(chunk, "IDAT")) { - size_t newsize; - if(lodepng_addofl(idatsize, chunkLength, &newsize)) CERROR_BREAK(state->error, 95); - if(newsize > insize) CERROR_BREAK(state->error, 95); - lodepng_memcpy(idat + idatsize, data, chunkLength); - idatsize += chunkLength; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - critical_pos = 3; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } else if(lodepng_chunk_type_equals(chunk, "IEND")) { - /*IEND chunk*/ - IEND = 1; - } else if(lodepng_chunk_type_equals(chunk, "PLTE")) { - /*palette chunk (PLTE)*/ - state->error = readChunk_PLTE(&state->info_png.color, data, chunkLength); - if(state->error) break; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - critical_pos = 2; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } else if(lodepng_chunk_type_equals(chunk, "tRNS")) { - /*palette transparency chunk (tRNS). Even though this one is an ancillary chunk , it is still compiled - in without 'LODEPNG_COMPILE_ANCILLARY_CHUNKS' because it contains essential color information that - affects the alpha channel of pixels. */ - state->error = readChunk_tRNS(&state->info_png.color, data, chunkLength); - if(state->error) break; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*background color chunk (bKGD)*/ - } else if(lodepng_chunk_type_equals(chunk, "bKGD")) { - state->error = readChunk_bKGD(&state->info_png, data, chunkLength); - if(state->error) break; - } else if(lodepng_chunk_type_equals(chunk, "tEXt")) { - /*text chunk (tEXt)*/ - if(state->decoder.read_text_chunks) { - state->error = readChunk_tEXt(&state->info_png, data, chunkLength); - if(state->error) break; - } - } else if(lodepng_chunk_type_equals(chunk, "zTXt")) { - /*compressed text chunk (zTXt)*/ - if(state->decoder.read_text_chunks) { - state->error = readChunk_zTXt(&state->info_png, &state->decoder, data, chunkLength); - if(state->error) break; - } - } else if(lodepng_chunk_type_equals(chunk, "iTXt")) { - /*international text chunk (iTXt)*/ - if(state->decoder.read_text_chunks) { - state->error = readChunk_iTXt(&state->info_png, &state->decoder, data, chunkLength); - if(state->error) break; - } - } else if(lodepng_chunk_type_equals(chunk, "tIME")) { - state->error = readChunk_tIME(&state->info_png, data, chunkLength); - if(state->error) break; - } else if(lodepng_chunk_type_equals(chunk, "pHYs")) { - state->error = readChunk_pHYs(&state->info_png, data, chunkLength); - if(state->error) break; - } else if(lodepng_chunk_type_equals(chunk, "gAMA")) { - state->error = readChunk_gAMA(&state->info_png, data, chunkLength); - if(state->error) break; - } else if(lodepng_chunk_type_equals(chunk, "cHRM")) { - state->error = readChunk_cHRM(&state->info_png, data, chunkLength); - if(state->error) break; - } else if(lodepng_chunk_type_equals(chunk, "sRGB")) { - state->error = readChunk_sRGB(&state->info_png, data, chunkLength); - if(state->error) break; - } else if(lodepng_chunk_type_equals(chunk, "iCCP")) { - state->error = readChunk_iCCP(&state->info_png, &state->decoder, data, chunkLength); - if(state->error) break; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } else /*it's not an implemented chunk type, so ignore it: skip over the data*/ { - /*error: unknown critical chunk (5th bit of first byte of chunk type is 0)*/ - if(!state->decoder.ignore_critical && !lodepng_chunk_ancillary(chunk)) { - CERROR_BREAK(state->error, 69); - } - - unknown = 1; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - if(state->decoder.remember_unknown_chunks) { - state->error = lodepng_chunk_append(&state->info_png.unknown_chunks_data[critical_pos - 1], - &state->info_png.unknown_chunks_size[critical_pos - 1], chunk); - if(state->error) break; - } -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } - - if(!state->decoder.ignore_crc && !unknown) /*check CRC if wanted, only on known chunk types*/ { - if(lodepng_chunk_check_crc(chunk)) CERROR_BREAK(state->error, 57); /*invalid CRC*/ - } - - if(!IEND) chunk = lodepng_chunk_next_const(chunk, in + insize); - } - - if(!state->error && state->info_png.color.colortype == LCT_PALETTE && !state->info_png.color.palette) { - state->error = 106; /* error: PNG file must have PLTE chunk if color type is palette */ - } - - if(!state->error) { - /*predict output size, to allocate exact size for output buffer to avoid more dynamic allocation. - If the decompressed size does not match the prediction, the image must be corrupt.*/ - if(state->info_png.interlace_method == 0) { - size_t bpp = lodepng_get_bpp(&state->info_png.color); - expected_size = lodepng_get_raw_size_idat(*w, *h, bpp); - } else { - size_t bpp = lodepng_get_bpp(&state->info_png.color); - /*Adam-7 interlaced: expected size is the sum of the 7 sub-images sizes*/ - expected_size = 0; - expected_size += lodepng_get_raw_size_idat((*w + 7) >> 3, (*h + 7) >> 3, bpp); - if(*w > 4) expected_size += lodepng_get_raw_size_idat((*w + 3) >> 3, (*h + 7) >> 3, bpp); - expected_size += lodepng_get_raw_size_idat((*w + 3) >> 2, (*h + 3) >> 3, bpp); - if(*w > 2) expected_size += lodepng_get_raw_size_idat((*w + 1) >> 2, (*h + 3) >> 2, bpp); - expected_size += lodepng_get_raw_size_idat((*w + 1) >> 1, (*h + 1) >> 2, bpp); - if(*w > 1) expected_size += lodepng_get_raw_size_idat((*w + 0) >> 1, (*h + 1) >> 1, bpp); - expected_size += lodepng_get_raw_size_idat((*w + 0), (*h + 0) >> 1, bpp); - } - - state->error = zlib_decompress(&scanlines, &scanlines_size, expected_size, idat, idatsize, &state->decoder.zlibsettings); - } - if(!state->error && scanlines_size != expected_size) state->error = 91; /*decompressed size doesn't match prediction*/ - lodepng_free(idat); - - if(!state->error) { - outsize = lodepng_get_raw_size(*w, *h, &state->info_png.color); - *out = (unsigned char*)lodepng_malloc(outsize); - if(!*out) state->error = 83; /*alloc fail*/ - } - if(!state->error) { - lodepng_memset(*out, 0, outsize); - state->error = postProcessScanlines(*out, scanlines, *w, *h, &state->info_png); - } - lodepng_free(scanlines); -} - -unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h, - LodePNGState* state, - const unsigned char* in, size_t insize) { - *out = 0; - decodeGeneric(out, w, h, state, in, insize); - if(state->error) return state->error; - if(!state->decoder.color_convert || lodepng_color_mode_equal(&state->info_raw, &state->info_png.color)) { - /*same color type, no copying or converting of data needed*/ - /*store the info_png color settings on the info_raw so that the info_raw still reflects what colortype - the raw image has to the end user*/ - if(!state->decoder.color_convert) { - state->error = lodepng_color_mode_copy(&state->info_raw, &state->info_png.color); - if(state->error) return state->error; - } - } else { /*color conversion needed*/ - unsigned char* data = *out; - size_t outsize; - - /*TODO: check if this works according to the statement in the documentation: "The converter can convert - from grayscale input color type, to 8-bit grayscale or grayscale with alpha"*/ - if(!(state->info_raw.colortype == LCT_RGB || state->info_raw.colortype == LCT_RGBA) - && !(state->info_raw.bitdepth == 8)) { - return 56; /*unsupported color mode conversion*/ - } - - outsize = lodepng_get_raw_size(*w, *h, &state->info_raw); - *out = (unsigned char*)lodepng_malloc(outsize); - if(!(*out)) { - state->error = 83; /*alloc fail*/ - } - else state->error = lodepng_convert(*out, data, &state->info_raw, - &state->info_png.color, *w, *h); - lodepng_free(data); - } - return state->error; -} - -unsigned lodepng_decode_memory(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, - size_t insize, LodePNGColorType colortype, unsigned bitdepth) { - unsigned error; - LodePNGState state; - lodepng_state_init(&state); - state.info_raw.colortype = colortype; - state.info_raw.bitdepth = bitdepth; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*disable reading things that this function doesn't output*/ - state.decoder.read_text_chunks = 0; - state.decoder.remember_unknown_chunks = 0; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - error = lodepng_decode(out, w, h, &state, in, insize); - lodepng_state_cleanup(&state); - return error; -} - -unsigned lodepng_decode32(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, size_t insize) { - return lodepng_decode_memory(out, w, h, in, insize, LCT_RGBA, 8); -} - -unsigned lodepng_decode24(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, size_t insize) { - return lodepng_decode_memory(out, w, h, in, insize, LCT_RGB, 8); -} - -#ifdef LODEPNG_COMPILE_DISK -unsigned lodepng_decode_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename, - LodePNGColorType colortype, unsigned bitdepth) { - unsigned char* buffer = 0; - size_t buffersize; - unsigned error; - /* safe output values in case error happens */ - *out = 0; - *w = *h = 0; - error = lodepng_load_file(&buffer, &buffersize, filename); - if(!error) error = lodepng_decode_memory(out, w, h, buffer, buffersize, colortype, bitdepth); - lodepng_free(buffer); - return error; -} - -unsigned lodepng_decode32_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename) { - return lodepng_decode_file(out, w, h, filename, LCT_RGBA, 8); -} - -unsigned lodepng_decode24_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename) { - return lodepng_decode_file(out, w, h, filename, LCT_RGB, 8); -} -#endif /*LODEPNG_COMPILE_DISK*/ - -void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings) { - settings->color_convert = 1; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - settings->read_text_chunks = 1; - settings->remember_unknown_chunks = 0; - settings->max_text_size = 16777216; - settings->max_icc_size = 16777216; /* 16MB is much more than enough for any reasonable ICC profile */ -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - settings->ignore_crc = 0; - settings->ignore_critical = 0; - settings->ignore_end = 0; - lodepng_decompress_settings_init(&settings->zlibsettings); -} - -#endif /*LODEPNG_COMPILE_DECODER*/ - -#if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) - -void lodepng_state_init(LodePNGState* state) { -#ifdef LODEPNG_COMPILE_DECODER - lodepng_decoder_settings_init(&state->decoder); -#endif /*LODEPNG_COMPILE_DECODER*/ -#ifdef LODEPNG_COMPILE_ENCODER - lodepng_encoder_settings_init(&state->encoder); -#endif /*LODEPNG_COMPILE_ENCODER*/ - lodepng_color_mode_init(&state->info_raw); - lodepng_info_init(&state->info_png); - state->error = 1; -} - -void lodepng_state_cleanup(LodePNGState* state) { - lodepng_color_mode_cleanup(&state->info_raw); - lodepng_info_cleanup(&state->info_png); -} - -void lodepng_state_copy(LodePNGState* dest, const LodePNGState* source) { - lodepng_state_cleanup(dest); - *dest = *source; - lodepng_color_mode_init(&dest->info_raw); - lodepng_info_init(&dest->info_png); - dest->error = lodepng_color_mode_copy(&dest->info_raw, &source->info_raw); if(dest->error) return; - dest->error = lodepng_info_copy(&dest->info_png, &source->info_png); if(dest->error) return; -} - -#endif /* defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) */ - -#ifdef LODEPNG_COMPILE_ENCODER - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / PNG Encoder / */ -/* ////////////////////////////////////////////////////////////////////////// */ - - -static unsigned writeSignature(ucvector* out) { - size_t pos = out->size; - const unsigned char signature[] = {137, 80, 78, 71, 13, 10, 26, 10}; - /*8 bytes PNG signature, aka the magic bytes*/ - if(!ucvector_resize(out, out->size + 8)) return 83; /*alloc fail*/ - lodepng_memcpy(out->data + pos, signature, 8); - return 0; -} - -static unsigned addChunk_IHDR(ucvector* out, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth, unsigned interlace_method) { - unsigned char *chunk, *data; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 13, "IHDR")); - data = chunk + 8; - - lodepng_set32bitInt(data + 0, w); /*width*/ - lodepng_set32bitInt(data + 4, h); /*height*/ - data[8] = (unsigned char)bitdepth; /*bit depth*/ - data[9] = (unsigned char)colortype; /*color type*/ - data[10] = 0; /*compression method*/ - data[11] = 0; /*filter method*/ - data[12] = interlace_method; /*interlace method*/ - - lodepng_chunk_generate_crc(chunk); - return 0; -} - -/* only adds the chunk if needed (there is a key or palette with alpha) */ -static unsigned addChunk_PLTE(ucvector* out, const LodePNGColorMode* info) { - unsigned char* chunk; - size_t i, j = 8; - - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, info->palettesize * 3, "PLTE")); - - for(i = 0; i != info->palettesize; ++i) { - /*add all channels except alpha channel*/ - chunk[j++] = info->palette[i * 4 + 0]; - chunk[j++] = info->palette[i * 4 + 1]; - chunk[j++] = info->palette[i * 4 + 2]; - } - - lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_tRNS(ucvector* out, const LodePNGColorMode* info) { - unsigned char* chunk = 0; - - if(info->colortype == LCT_PALETTE) { - size_t i, amount = info->palettesize; - /*the tail of palette values that all have 255 as alpha, does not have to be encoded*/ - for(i = info->palettesize; i != 0; --i) { - if(info->palette[4 * (i - 1) + 3] != 255) break; - --amount; - } - if(amount) { - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, amount, "tRNS")); - /*add the alpha channel values from the palette*/ - for(i = 0; i != amount; ++i) chunk[8 + i] = info->palette[4 * i + 3]; - } - } else if(info->colortype == LCT_GREY) { - if(info->key_defined) { - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 2, "tRNS")); - chunk[8] = (unsigned char)(info->key_r >> 8); - chunk[9] = (unsigned char)(info->key_r & 255); - } - } else if(info->colortype == LCT_RGB) { - if(info->key_defined) { - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 6, "tRNS")); - chunk[8] = (unsigned char)(info->key_r >> 8); - chunk[9] = (unsigned char)(info->key_r & 255); - chunk[10] = (unsigned char)(info->key_g >> 8); - chunk[11] = (unsigned char)(info->key_g & 255); - chunk[12] = (unsigned char)(info->key_b >> 8); - chunk[13] = (unsigned char)(info->key_b & 255); - } - } - - if(chunk) lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_IDAT(ucvector* out, const unsigned char* data, size_t datasize, - LodePNGCompressSettings* zlibsettings) { - unsigned error = 0; - unsigned char* zlib = 0; - size_t zlibsize = 0; - - error = zlib_compress(&zlib, &zlibsize, data, datasize, zlibsettings); - if(!error) { - error = lodepng_chunk_createv(out, zlibsize, "IDAT", zlib); - } - lodepng_free(zlib); - return error; -} - -static unsigned addChunk_IEND(ucvector* out) { - return lodepng_chunk_createv(out, 0, "IEND", 0); -} - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - -static unsigned addChunk_tEXt(ucvector* out, const char* keyword, const char* textstring) { - unsigned char* chunk = 0; - size_t keysize = lodepng_strlen(keyword), textsize = lodepng_strlen(textstring); - size_t size = keysize + 1 + textsize; - if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, size, "tEXt")); - lodepng_memcpy(chunk + 8, keyword, keysize); - chunk[8 + keysize] = 0; /*null termination char*/ - lodepng_memcpy(chunk + 9 + keysize, textstring, textsize); - lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_zTXt(ucvector* out, const char* keyword, const char* textstring, - LodePNGCompressSettings* zlibsettings) { - unsigned error = 0; - unsigned char* chunk = 0; - unsigned char* compressed = 0; - size_t compressedsize = 0; - size_t textsize = lodepng_strlen(textstring); - size_t keysize = lodepng_strlen(keyword); - if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ - - error = zlib_compress(&compressed, &compressedsize, - (const unsigned char*)textstring, textsize, zlibsettings); - if(!error) { - size_t size = keysize + 2 + compressedsize; - error = lodepng_chunk_init(&chunk, out, size, "zTXt"); - } - if(!error) { - lodepng_memcpy(chunk + 8, keyword, keysize); - chunk[8 + keysize] = 0; /*null termination char*/ - chunk[9 + keysize] = 0; /*compression method: 0*/ - lodepng_memcpy(chunk + 10 + keysize, compressed, compressedsize); - lodepng_chunk_generate_crc(chunk); - } - - lodepng_free(compressed); - return error; -} - -static unsigned addChunk_iTXt(ucvector* out, unsigned compress, const char* keyword, const char* langtag, - const char* transkey, const char* textstring, LodePNGCompressSettings* zlibsettings) { - unsigned error = 0; - unsigned char* chunk = 0; - unsigned char* compressed = 0; - size_t compressedsize = 0; - size_t textsize = lodepng_strlen(textstring); - size_t keysize = lodepng_strlen(keyword), langsize = lodepng_strlen(langtag), transsize = lodepng_strlen(transkey); - - if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ - - if(compress) { - error = zlib_compress(&compressed, &compressedsize, - (const unsigned char*)textstring, textsize, zlibsettings); - } - if(!error) { - size_t size = keysize + 3 + langsize + 1 + transsize + 1 + (compress ? compressedsize : textsize); - error = lodepng_chunk_init(&chunk, out, size, "iTXt"); - } - if(!error) { - size_t pos = 8; - lodepng_memcpy(chunk + pos, keyword, keysize); - pos += keysize; - chunk[pos++] = 0; /*null termination char*/ - chunk[pos++] = (compress ? 1 : 0); /*compression flag*/ - chunk[pos++] = 0; /*compression method: 0*/ - lodepng_memcpy(chunk + pos, langtag, langsize); - pos += langsize; - chunk[pos++] = 0; /*null termination char*/ - lodepng_memcpy(chunk + pos, transkey, transsize); - pos += transsize; - chunk[pos++] = 0; /*null termination char*/ - if(compress) { - lodepng_memcpy(chunk + pos, compressed, compressedsize); - } else { - lodepng_memcpy(chunk + pos, textstring, textsize); - } - lodepng_chunk_generate_crc(chunk); - } - - lodepng_free(compressed); - return error; -} - -static unsigned addChunk_bKGD(ucvector* out, const LodePNGInfo* info) { - unsigned char* chunk = 0; - if(info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) { - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 2, "bKGD")); - chunk[8] = (unsigned char)(info->background_r >> 8); - chunk[9] = (unsigned char)(info->background_r & 255); - } else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) { - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 6, "bKGD")); - chunk[8] = (unsigned char)(info->background_r >> 8); - chunk[9] = (unsigned char)(info->background_r & 255); - chunk[10] = (unsigned char)(info->background_g >> 8); - chunk[11] = (unsigned char)(info->background_g & 255); - chunk[12] = (unsigned char)(info->background_b >> 8); - chunk[13] = (unsigned char)(info->background_b & 255); - } else if(info->color.colortype == LCT_PALETTE) { - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 1, "bKGD")); - chunk[8] = (unsigned char)(info->background_r & 255); /*palette index*/ - } - if(chunk) lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_tIME(ucvector* out, const LodePNGTime* time) { - unsigned char* chunk; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 7, "tIME")); - chunk[8] = (unsigned char)(time->year >> 8); - chunk[9] = (unsigned char)(time->year & 255); - chunk[10] = (unsigned char)time->month; - chunk[11] = (unsigned char)time->day; - chunk[12] = (unsigned char)time->hour; - chunk[13] = (unsigned char)time->minute; - chunk[14] = (unsigned char)time->second; - lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_pHYs(ucvector* out, const LodePNGInfo* info) { - unsigned char* chunk; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 9, "pHYs")); - lodepng_set32bitInt(chunk + 8, info->phys_x); - lodepng_set32bitInt(chunk + 12, info->phys_y); - chunk[16] = info->phys_unit; - lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_gAMA(ucvector* out, const LodePNGInfo* info) { - unsigned char* chunk; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 4, "gAMA")); - lodepng_set32bitInt(chunk + 8, info->gama_gamma); - lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_cHRM(ucvector* out, const LodePNGInfo* info) { - unsigned char* chunk; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 32, "cHRM")); - lodepng_set32bitInt(chunk + 8, info->chrm_white_x); - lodepng_set32bitInt(chunk + 12, info->chrm_white_y); - lodepng_set32bitInt(chunk + 16, info->chrm_red_x); - lodepng_set32bitInt(chunk + 20, info->chrm_red_y); - lodepng_set32bitInt(chunk + 24, info->chrm_green_x); - lodepng_set32bitInt(chunk + 28, info->chrm_green_y); - lodepng_set32bitInt(chunk + 32, info->chrm_blue_x); - lodepng_set32bitInt(chunk + 36, info->chrm_blue_y); - lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_sRGB(ucvector* out, const LodePNGInfo* info) { - unsigned char data = info->srgb_intent; - return lodepng_chunk_createv(out, 1, "sRGB", &data); -} - -static unsigned addChunk_iCCP(ucvector* out, const LodePNGInfo* info, LodePNGCompressSettings* zlibsettings) { - unsigned error = 0; - unsigned char* chunk = 0; - unsigned char* compressed = 0; - size_t compressedsize = 0; - size_t keysize = lodepng_strlen(info->iccp_name); - - if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ - error = zlib_compress(&compressed, &compressedsize, - info->iccp_profile, info->iccp_profile_size, zlibsettings); - if(!error) { - size_t size = keysize + 2 + compressedsize; - error = lodepng_chunk_init(&chunk, out, size, "iCCP"); - } - if(!error) { - lodepng_memcpy(chunk + 8, info->iccp_name, keysize); - chunk[8 + keysize] = 0; /*null termination char*/ - chunk[9 + keysize] = 0; /*compression method: 0*/ - lodepng_memcpy(chunk + 10 + keysize, compressed, compressedsize); - lodepng_chunk_generate_crc(chunk); - } - - lodepng_free(compressed); - return error; -} - -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -static void filterScanline(unsigned char* out, const unsigned char* scanline, const unsigned char* prevline, - size_t length, size_t bytewidth, unsigned char filterType) { - size_t i; - switch(filterType) { - case 0: /*None*/ - for(i = 0; i != length; ++i) out[i] = scanline[i]; - break; - case 1: /*Sub*/ - for(i = 0; i != bytewidth; ++i) out[i] = scanline[i]; - for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - scanline[i - bytewidth]; - break; - case 2: /*Up*/ - if(prevline) { - for(i = 0; i != length; ++i) out[i] = scanline[i] - prevline[i]; - } else { - for(i = 0; i != length; ++i) out[i] = scanline[i]; - } - break; - case 3: /*Average*/ - if(prevline) { - for(i = 0; i != bytewidth; ++i) out[i] = scanline[i] - (prevline[i] >> 1); - for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - ((scanline[i - bytewidth] + prevline[i]) >> 1); - } else { - for(i = 0; i != bytewidth; ++i) out[i] = scanline[i]; - for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - (scanline[i - bytewidth] >> 1); - } - break; - case 4: /*Paeth*/ - if(prevline) { - /*paethPredictor(0, prevline[i], 0) is always prevline[i]*/ - for(i = 0; i != bytewidth; ++i) out[i] = (scanline[i] - prevline[i]); - for(i = bytewidth; i < length; ++i) { - out[i] = (scanline[i] - paethPredictor(scanline[i - bytewidth], prevline[i], prevline[i - bytewidth])); - } - } else { - for(i = 0; i != bytewidth; ++i) out[i] = scanline[i]; - /*paethPredictor(scanline[i - bytewidth], 0, 0) is always scanline[i - bytewidth]*/ - for(i = bytewidth; i < length; ++i) out[i] = (scanline[i] - scanline[i - bytewidth]); - } - break; - default: return; /*invalid filter type given*/ - } -} - -/* integer binary logarithm, max return value is 31 */ -static size_t ilog2(size_t i) { - size_t result = 0; - if(i >= 65536) { result += 16; i >>= 16; } - if(i >= 256) { result += 8; i >>= 8; } - if(i >= 16) { result += 4; i >>= 4; } - if(i >= 4) { result += 2; i >>= 2; } - if(i >= 2) { result += 1; /*i >>= 1;*/ } - return result; -} - -/* integer approximation for i * log2(i), helper function for LFS_ENTROPY */ -static size_t ilog2i(size_t i) { - size_t l; - if(i == 0) return 0; - l = ilog2(i); - /* approximate i*log2(i): l is integer logarithm, ((i - (1u << l)) << 1u) - linearly approximates the missing fractional part multiplied by i */ - return i * l + ((i - (1u << l)) << 1u); -} - -static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, - const LodePNGColorMode* color, const LodePNGEncoderSettings* settings) { - /* - For PNG filter method 0 - out must be a buffer with as size: h + (w * h * bpp + 7u) / 8u, because there are - the scanlines with 1 extra byte per scanline - */ - - unsigned bpp = lodepng_get_bpp(color); - /*the width of a scanline in bytes, not including the filter type*/ - size_t linebytes = lodepng_get_raw_size_idat(w, 1, bpp) - 1u; - - /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/ - size_t bytewidth = (bpp + 7u) / 8u; - const unsigned char* prevline = 0; - unsigned x, y; - unsigned error = 0; - LodePNGFilterStrategy strategy = settings->filter_strategy; - - /* - There is a heuristic called the minimum sum of absolute differences heuristic, suggested by the PNG standard: - * If the image type is Palette, or the bit depth is smaller than 8, then do not filter the image (i.e. - use fixed filtering, with the filter None). - * (The other case) If the image type is Grayscale or RGB (with or without Alpha), and the bit depth is - not smaller than 8, then use adaptive filtering heuristic as follows: independently for each row, apply - all five filters and select the filter that produces the smallest sum of absolute values per row. - This heuristic is used if filter strategy is LFS_MINSUM and filter_palette_zero is true. - - If filter_palette_zero is true and filter_strategy is not LFS_MINSUM, the above heuristic is followed, - but for "the other case", whatever strategy filter_strategy is set to instead of the minimum sum - heuristic is used. - */ - if(settings->filter_palette_zero && - (color->colortype == LCT_PALETTE || color->bitdepth < 8)) strategy = LFS_ZERO; - - if(bpp == 0) return 31; /*error: invalid color type*/ - - if(strategy >= LFS_ZERO && strategy <= LFS_FOUR) { - unsigned char type = (unsigned char)strategy; - for(y = 0; y != h; ++y) { - size_t outindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ - size_t inindex = linebytes * y; - out[outindex] = type; /*filter type byte*/ - filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, type); - prevline = &in[inindex]; - } - } else if(strategy == LFS_MINSUM) { - /*adaptive filtering*/ - unsigned char* attempt[5]; /*five filtering attempts, one for each filter type*/ - size_t smallest = 0; - unsigned char type, bestType = 0; - - for(type = 0; type != 5; ++type) { - attempt[type] = (unsigned char*)lodepng_malloc(linebytes); - if(!attempt[type]) error = 83; /*alloc fail*/ - } - - if(!error) { - for(y = 0; y != h; ++y) { - /*try the 5 filter types*/ - for(type = 0; type != 5; ++type) { - size_t sum = 0; - filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); - - /*calculate the sum of the result*/ - if(type == 0) { - for(x = 0; x != linebytes; ++x) sum += (unsigned char)(attempt[type][x]); - } else { - for(x = 0; x != linebytes; ++x) { - /*For differences, each byte should be treated as signed, values above 127 are negative - (converted to signed char). Filtertype 0 isn't a difference though, so use unsigned there. - This means filtertype 0 is almost never chosen, but that is justified.*/ - unsigned char s = attempt[type][x]; - sum += s < 128 ? s : (255U - s); - } - } - - /*check if this is smallest sum (or if type == 0 it's the first case so always store the values)*/ - if(type == 0 || sum < smallest) { - bestType = type; - smallest = sum; - } - } - - prevline = &in[y * linebytes]; - - /*now fill the out values*/ - out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ - for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; - } - } - - for(type = 0; type != 5; ++type) lodepng_free(attempt[type]); - } else if(strategy == LFS_ENTROPY) { - unsigned char* attempt[5]; /*five filtering attempts, one for each filter type*/ - size_t bestSum = 0; - unsigned type, bestType = 0; - unsigned count[256]; - - for(type = 0; type != 5; ++type) { - attempt[type] = (unsigned char*)lodepng_malloc(linebytes); - if(!attempt[type]) error = 83; /*alloc fail*/ - } - - if(!error) { - for(y = 0; y != h; ++y) { - /*try the 5 filter types*/ - for(type = 0; type != 5; ++type) { - size_t sum = 0; - filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); - lodepng_memset(count, 0, 256 * sizeof(*count)); - for(x = 0; x != linebytes; ++x) ++count[attempt[type][x]]; - ++count[type]; /*the filter type itself is part of the scanline*/ - for(x = 0; x != 256; ++x) { - sum += ilog2i(count[x]); - } - /*check if this is smallest sum (or if type == 0 it's the first case so always store the values)*/ - if(type == 0 || sum > bestSum) { - bestType = type; - bestSum = sum; - } - } - - prevline = &in[y * linebytes]; - - /*now fill the out values*/ - out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ - for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; - } - } - - for(type = 0; type != 5; ++type) lodepng_free(attempt[type]); - } else if(strategy == LFS_PREDEFINED) { - for(y = 0; y != h; ++y) { - size_t outindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ - size_t inindex = linebytes * y; - unsigned char type = settings->predefined_filters[y]; - out[outindex] = type; /*filter type byte*/ - filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, type); - prevline = &in[inindex]; - } - } else if(strategy == LFS_BRUTE_FORCE) { - /*brute force filter chooser. - deflate the scanline after every filter attempt to see which one deflates best. - This is very slow and gives only slightly smaller, sometimes even larger, result*/ - size_t size[5]; - unsigned char* attempt[5]; /*five filtering attempts, one for each filter type*/ - size_t smallest = 0; - unsigned type = 0, bestType = 0; - unsigned char* dummy; - LodePNGCompressSettings zlibsettings; - lodepng_memcpy(&zlibsettings, &settings->zlibsettings, sizeof(LodePNGCompressSettings)); - /*use fixed tree on the attempts so that the tree is not adapted to the filtertype on purpose, - to simulate the true case where the tree is the same for the whole image. Sometimes it gives - better result with dynamic tree anyway. Using the fixed tree sometimes gives worse, but in rare - cases better compression. It does make this a bit less slow, so it's worth doing this.*/ - zlibsettings.btype = 1; - /*a custom encoder likely doesn't read the btype setting and is optimized for complete PNG - images only, so disable it*/ - zlibsettings.custom_zlib = 0; - zlibsettings.custom_deflate = 0; - for(type = 0; type != 5; ++type) { - attempt[type] = (unsigned char*)lodepng_malloc(linebytes); - if(!attempt[type]) error = 83; /*alloc fail*/ - } - if(!error) { - for(y = 0; y != h; ++y) /*try the 5 filter types*/ { - for(type = 0; type != 5; ++type) { - unsigned testsize = (unsigned)linebytes; - /*if(testsize > 8) testsize /= 8;*/ /*it already works good enough by testing a part of the row*/ - - filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); - size[type] = 0; - dummy = 0; - zlib_compress(&dummy, &size[type], attempt[type], testsize, &zlibsettings); - lodepng_free(dummy); - /*check if this is smallest size (or if type == 0 it's the first case so always store the values)*/ - if(type == 0 || size[type] < smallest) { - bestType = type; - smallest = size[type]; - } - } - prevline = &in[y * linebytes]; - out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ - for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; - } - } - for(type = 0; type != 5; ++type) lodepng_free(attempt[type]); - } - else return 88; /* unknown filter strategy */ - - return error; -} - -static void addPaddingBits(unsigned char* out, const unsigned char* in, - size_t olinebits, size_t ilinebits, unsigned h) { - /*The opposite of the removePaddingBits function - olinebits must be >= ilinebits*/ - unsigned y; - size_t diff = olinebits - ilinebits; - size_t obp = 0, ibp = 0; /*bit pointers*/ - for(y = 0; y != h; ++y) { - size_t x; - for(x = 0; x < ilinebits; ++x) { - unsigned char bit = readBitFromReversedStream(&ibp, in); - setBitOfReversedStream(&obp, out, bit); - } - /*obp += diff; --> no, fill in some value in the padding bits too, to avoid - "Use of uninitialised value of size ###" warning from valgrind*/ - for(x = 0; x != diff; ++x) setBitOfReversedStream(&obp, out, 0); - } -} - -/* -in: non-interlaced image with size w*h -out: the same pixels, but re-ordered according to PNG's Adam7 interlacing, with - no padding bits between scanlines, but between reduced images so that each - reduced image starts at a byte. -bpp: bits per pixel -there are no padding bits, not between scanlines, not between reduced images -in has the following size in bits: w * h * bpp. -out is possibly bigger due to padding bits between reduced images -NOTE: comments about padding bits are only relevant if bpp < 8 -*/ -static void Adam7_interlace(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) { - unsigned passw[7], passh[7]; - size_t filter_passstart[8], padded_passstart[8], passstart[8]; - unsigned i; - - Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - - if(bpp >= 8) { - for(i = 0; i != 7; ++i) { - unsigned x, y, b; - size_t bytewidth = bpp / 8u; - for(y = 0; y < passh[i]; ++y) - for(x = 0; x < passw[i]; ++x) { - size_t pixelinstart = ((ADAM7_IY[i] + y * ADAM7_DY[i]) * w + ADAM7_IX[i] + x * ADAM7_DX[i]) * bytewidth; - size_t pixeloutstart = passstart[i] + (y * passw[i] + x) * bytewidth; - for(b = 0; b < bytewidth; ++b) { - out[pixeloutstart + b] = in[pixelinstart + b]; - } - } - } - } else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ { - for(i = 0; i != 7; ++i) { - unsigned x, y, b; - unsigned ilinebits = bpp * passw[i]; - unsigned olinebits = bpp * w; - size_t obp, ibp; /*bit pointers (for out and in buffer)*/ - for(y = 0; y < passh[i]; ++y) - for(x = 0; x < passw[i]; ++x) { - ibp = (ADAM7_IY[i] + y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + x * ADAM7_DX[i]) * bpp; - obp = (8 * passstart[i]) + (y * ilinebits + x * bpp); - for(b = 0; b < bpp; ++b) { - unsigned char bit = readBitFromReversedStream(&ibp, in); - setBitOfReversedStream(&obp, out, bit); - } - } - } - } -} - -/*out must be buffer big enough to contain uncompressed IDAT chunk data, and in must contain the full image. -return value is error**/ -static unsigned preProcessScanlines(unsigned char** out, size_t* outsize, const unsigned char* in, - unsigned w, unsigned h, - const LodePNGInfo* info_png, const LodePNGEncoderSettings* settings) { - /* - This function converts the pure 2D image with the PNG's colortype, into filtered-padded-interlaced data. Steps: - *) if no Adam7: 1) add padding bits (= possible extra bits per scanline if bpp < 8) 2) filter - *) if adam7: 1) Adam7_interlace 2) 7x add padding bits 3) 7x filter - */ - unsigned bpp = lodepng_get_bpp(&info_png->color); - unsigned error = 0; - - if(info_png->interlace_method == 0) { - *outsize = h + (h * ((w * bpp + 7u) / 8u)); /*image size plus an extra byte per scanline + possible padding bits*/ - *out = (unsigned char*)lodepng_malloc(*outsize); - if(!(*out) && (*outsize)) error = 83; /*alloc fail*/ - - if(!error) { - /*non multiple of 8 bits per scanline, padding bits needed per scanline*/ - if(bpp < 8 && w * bpp != ((w * bpp + 7u) / 8u) * 8u) { - unsigned char* padded = (unsigned char*)lodepng_malloc(h * ((w * bpp + 7u) / 8u)); - if(!padded) error = 83; /*alloc fail*/ - if(!error) { - addPaddingBits(padded, in, ((w * bpp + 7u) / 8u) * 8u, w * bpp, h); - error = filter(*out, padded, w, h, &info_png->color, settings); - } - lodepng_free(padded); - } else { - /*we can immediately filter into the out buffer, no other steps needed*/ - error = filter(*out, in, w, h, &info_png->color, settings); - } - } - } else /*interlace_method is 1 (Adam7)*/ { - unsigned passw[7], passh[7]; - size_t filter_passstart[8], padded_passstart[8], passstart[8]; - unsigned char* adam7; - - Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - - *outsize = filter_passstart[7]; /*image size plus an extra byte per scanline + possible padding bits*/ - *out = (unsigned char*)lodepng_malloc(*outsize); - if(!(*out)) error = 83; /*alloc fail*/ - - adam7 = (unsigned char*)lodepng_malloc(passstart[7]); - if(!adam7 && passstart[7]) error = 83; /*alloc fail*/ - - if(!error) { - unsigned i; - - Adam7_interlace(adam7, in, w, h, bpp); - for(i = 0; i != 7; ++i) { - if(bpp < 8) { - unsigned char* padded = (unsigned char*)lodepng_malloc(padded_passstart[i + 1] - padded_passstart[i]); - if(!padded) ERROR_BREAK(83); /*alloc fail*/ - addPaddingBits(padded, &adam7[passstart[i]], - ((passw[i] * bpp + 7u) / 8u) * 8u, passw[i] * bpp, passh[i]); - error = filter(&(*out)[filter_passstart[i]], padded, - passw[i], passh[i], &info_png->color, settings); - lodepng_free(padded); - } else { - error = filter(&(*out)[filter_passstart[i]], &adam7[padded_passstart[i]], - passw[i], passh[i], &info_png->color, settings); - } - - if(error) break; - } - } - - lodepng_free(adam7); - } - - return error; -} - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -static unsigned addUnknownChunks(ucvector* out, unsigned char* data, size_t datasize) { - unsigned char* inchunk = data; - while((size_t)(inchunk - data) < datasize) { - CERROR_TRY_RETURN(lodepng_chunk_append(&out->data, &out->size, inchunk)); - out->allocsize = out->size; /*fix the allocsize again*/ - inchunk = lodepng_chunk_next(inchunk, data + datasize); - } - return 0; -} - -static unsigned isGrayICCProfile(const unsigned char* profile, unsigned size) { - /* - It is a gray profile if bytes 16-19 are "GRAY", rgb profile if bytes 16-19 - are "RGB ". We do not perform any full parsing of the ICC profile here, other - than check those 4 bytes to grayscale profile. Other than that, validity of - the profile is not checked. This is needed only because the PNG specification - requires using a non-gray color model if there is an ICC profile with "RGB " - (sadly limiting compression opportunities if the input data is grayscale RGB - data), and requires using a gray color model if it is "GRAY". - */ - if(size < 20) return 0; - return profile[16] == 'G' && profile[17] == 'R' && profile[18] == 'A' && profile[19] == 'Y'; -} - -static unsigned isRGBICCProfile(const unsigned char* profile, unsigned size) { - /* See comment in isGrayICCProfile*/ - if(size < 20) return 0; - return profile[16] == 'R' && profile[17] == 'G' && profile[18] == 'B' && profile[19] == ' '; -} -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -unsigned lodepng_encode(unsigned char** out, size_t* outsize, - const unsigned char* image, unsigned w, unsigned h, - LodePNGState* state) { - unsigned char* data = 0; /*uncompressed version of the IDAT chunk data*/ - size_t datasize = 0; - ucvector outv = ucvector_init(NULL, 0); - LodePNGInfo info; - const LodePNGInfo* info_png = &state->info_png; - - lodepng_info_init(&info); - - /*provide some proper output values if error will happen*/ - *out = 0; - *outsize = 0; - state->error = 0; - - /*check input values validity*/ - if((info_png->color.colortype == LCT_PALETTE || state->encoder.force_palette) - && (info_png->color.palettesize == 0 || info_png->color.palettesize > 256)) { - state->error = 68; /*invalid palette size, it is only allowed to be 1-256*/ - goto cleanup; - } - if(state->encoder.zlibsettings.btype > 2) { - state->error = 61; /*error: invalid btype*/ - goto cleanup; - } - if(info_png->interlace_method > 1) { - state->error = 71; /*error: invalid interlace mode*/ - goto cleanup; - } - state->error = checkColorValidity(info_png->color.colortype, info_png->color.bitdepth); - if(state->error) goto cleanup; /*error: invalid color type given*/ - state->error = checkColorValidity(state->info_raw.colortype, state->info_raw.bitdepth); - if(state->error) goto cleanup; /*error: invalid color type given*/ - - /* color convert and compute scanline filter types */ - lodepng_info_copy(&info, &state->info_png); - if(state->encoder.auto_convert) { - LodePNGColorStats stats; - lodepng_color_stats_init(&stats); -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - if(info_png->iccp_defined && - isGrayICCProfile(info_png->iccp_profile, info_png->iccp_profile_size)) { - /*the PNG specification does not allow to use palette with a GRAY ICC profile, even - if the palette has only gray colors, so disallow it.*/ - stats.allow_palette = 0; - } - if(info_png->iccp_defined && - isRGBICCProfile(info_png->iccp_profile, info_png->iccp_profile_size)) { - /*the PNG specification does not allow to use grayscale color with RGB ICC profile, so disallow gray.*/ - stats.allow_greyscale = 0; - } -#endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */ - state->error = lodepng_compute_color_stats(&stats, image, w, h, &state->info_raw); - if(state->error) goto cleanup; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - if(info_png->background_defined) { - /*the background chunk's color must be taken into account as well*/ - unsigned r = 0, g = 0, b = 0; - LodePNGColorMode mode16 = lodepng_color_mode_make(LCT_RGB, 16); - lodepng_convert_rgb(&r, &g, &b, info_png->background_r, info_png->background_g, info_png->background_b, &mode16, &info_png->color); - state->error = lodepng_color_stats_add(&stats, r, g, b, 65535); - if(state->error) goto cleanup; - } -#endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */ - state->error = auto_choose_color(&info.color, &state->info_raw, &stats); - if(state->error) goto cleanup; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*also convert the background chunk*/ - if(info_png->background_defined) { - if(lodepng_convert_rgb(&info.background_r, &info.background_g, &info.background_b, - info_png->background_r, info_png->background_g, info_png->background_b, &info.color, &info_png->color)) { - state->error = 104; - goto cleanup; - } - } -#endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */ - } -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - if(info_png->iccp_defined) { - unsigned gray_icc = isGrayICCProfile(info_png->iccp_profile, info_png->iccp_profile_size); - unsigned rgb_icc = isRGBICCProfile(info_png->iccp_profile, info_png->iccp_profile_size); - unsigned gray_png = info.color.colortype == LCT_GREY || info.color.colortype == LCT_GREY_ALPHA; - if(!gray_icc && !rgb_icc) { - state->error = 100; /* Disallowed profile color type for PNG */ - goto cleanup; - } - if(gray_icc != gray_png) { - /*Not allowed to use RGB/RGBA/palette with GRAY ICC profile or vice versa, - or in case of auto_convert, it wasn't possible to find appropriate model*/ - state->error = state->encoder.auto_convert ? 102 : 101; - goto cleanup; - } - } -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - if(!lodepng_color_mode_equal(&state->info_raw, &info.color)) { - unsigned char* converted; - size_t size = ((size_t)w * (size_t)h * (size_t)lodepng_get_bpp(&info.color) + 7u) / 8u; - - converted = (unsigned char*)lodepng_malloc(size); - if(!converted && size) state->error = 83; /*alloc fail*/ - if(!state->error) { - state->error = lodepng_convert(converted, image, &info.color, &state->info_raw, w, h); - } - if(!state->error) { - state->error = preProcessScanlines(&data, &datasize, converted, w, h, &info, &state->encoder); - } - lodepng_free(converted); - if(state->error) goto cleanup; - } else { - state->error = preProcessScanlines(&data, &datasize, image, w, h, &info, &state->encoder); - if(state->error) goto cleanup; - } - - /* output all PNG chunks */ { -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - size_t i; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - /*write signature and chunks*/ - state->error = writeSignature(&outv); - if(state->error) goto cleanup; - /*IHDR*/ - state->error = addChunk_IHDR(&outv, w, h, info.color.colortype, info.color.bitdepth, info.interlace_method); - if(state->error) goto cleanup; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*unknown chunks between IHDR and PLTE*/ - if(info.unknown_chunks_data[0]) { - state->error = addUnknownChunks(&outv, info.unknown_chunks_data[0], info.unknown_chunks_size[0]); - if(state->error) goto cleanup; - } - /*color profile chunks must come before PLTE */ - if(info.iccp_defined) { - state->error = addChunk_iCCP(&outv, &info, &state->encoder.zlibsettings); - if(state->error) goto cleanup; - } - if(info.srgb_defined) { - state->error = addChunk_sRGB(&outv, &info); - if(state->error) goto cleanup; - } - if(info.gama_defined) { - state->error = addChunk_gAMA(&outv, &info); - if(state->error) goto cleanup; - } - if(info.chrm_defined) { - state->error = addChunk_cHRM(&outv, &info); - if(state->error) goto cleanup; - } -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - /*PLTE*/ - if(info.color.colortype == LCT_PALETTE) { - state->error = addChunk_PLTE(&outv, &info.color); - if(state->error) goto cleanup; - } - if(state->encoder.force_palette && (info.color.colortype == LCT_RGB || info.color.colortype == LCT_RGBA)) { - /*force_palette means: write suggested palette for truecolor in PLTE chunk*/ - state->error = addChunk_PLTE(&outv, &info.color); - if(state->error) goto cleanup; - } - /*tRNS (this will only add if when necessary) */ - state->error = addChunk_tRNS(&outv, &info.color); - if(state->error) goto cleanup; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*bKGD (must come between PLTE and the IDAt chunks*/ - if(info.background_defined) { - state->error = addChunk_bKGD(&outv, &info); - if(state->error) goto cleanup; - } - /*pHYs (must come before the IDAT chunks)*/ - if(info.phys_defined) { - state->error = addChunk_pHYs(&outv, &info); - if(state->error) goto cleanup; - } - - /*unknown chunks between PLTE and IDAT*/ - if(info.unknown_chunks_data[1]) { - state->error = addUnknownChunks(&outv, info.unknown_chunks_data[1], info.unknown_chunks_size[1]); - if(state->error) goto cleanup; - } -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - /*IDAT (multiple IDAT chunks must be consecutive)*/ - state->error = addChunk_IDAT(&outv, data, datasize, &state->encoder.zlibsettings); - if(state->error) goto cleanup; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*tIME*/ - if(info.time_defined) { - state->error = addChunk_tIME(&outv, &info.time); - if(state->error) goto cleanup; - } - /*tEXt and/or zTXt*/ - for(i = 0; i != info.text_num; ++i) { - if(lodepng_strlen(info.text_keys[i]) > 79) { - state->error = 66; /*text chunk too large*/ - goto cleanup; - } - if(lodepng_strlen(info.text_keys[i]) < 1) { - state->error = 67; /*text chunk too small*/ - goto cleanup; - } - if(state->encoder.text_compression) { - state->error = addChunk_zTXt(&outv, info.text_keys[i], info.text_strings[i], &state->encoder.zlibsettings); - if(state->error) goto cleanup; - } else { - state->error = addChunk_tEXt(&outv, info.text_keys[i], info.text_strings[i]); - if(state->error) goto cleanup; - } - } - /*LodePNG version id in text chunk*/ - if(state->encoder.add_id) { - unsigned already_added_id_text = 0; - for(i = 0; i != info.text_num; ++i) { - const char* k = info.text_keys[i]; - /* Could use strcmp, but we're not calling or reimplementing this C library function for this use only */ - if(k[0] == 'L' && k[1] == 'o' && k[2] == 'd' && k[3] == 'e' && - k[4] == 'P' && k[5] == 'N' && k[6] == 'G' && k[7] == '\0') { - already_added_id_text = 1; - break; - } - } - if(already_added_id_text == 0) { - state->error = addChunk_tEXt(&outv, "LodePNG", LODEPNG_VERSION_STRING); /*it's shorter as tEXt than as zTXt chunk*/ - if(state->error) goto cleanup; - } - } - /*iTXt*/ - for(i = 0; i != info.itext_num; ++i) { - if(lodepng_strlen(info.itext_keys[i]) > 79) { - state->error = 66; /*text chunk too large*/ - goto cleanup; - } - if(lodepng_strlen(info.itext_keys[i]) < 1) { - state->error = 67; /*text chunk too small*/ - goto cleanup; - } - state->error = addChunk_iTXt( - &outv, state->encoder.text_compression, - info.itext_keys[i], info.itext_langtags[i], info.itext_transkeys[i], info.itext_strings[i], - &state->encoder.zlibsettings); - if(state->error) goto cleanup; - } - - /*unknown chunks between IDAT and IEND*/ - if(info.unknown_chunks_data[2]) { - state->error = addUnknownChunks(&outv, info.unknown_chunks_data[2], info.unknown_chunks_size[2]); - if(state->error) goto cleanup; - } -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - state->error = addChunk_IEND(&outv); - if(state->error) goto cleanup; - } - -cleanup: - lodepng_info_cleanup(&info); - lodepng_free(data); - - /*instead of cleaning the vector up, give it to the output*/ - *out = outv.data; - *outsize = outv.size; - - return state->error; -} - -unsigned lodepng_encode_memory(unsigned char** out, size_t* outsize, const unsigned char* image, - unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) { - unsigned error; - LodePNGState state; - lodepng_state_init(&state); - state.info_raw.colortype = colortype; - state.info_raw.bitdepth = bitdepth; - state.info_png.color.colortype = colortype; - state.info_png.color.bitdepth = bitdepth; - lodepng_encode(out, outsize, image, w, h, &state); - error = state.error; - lodepng_state_cleanup(&state); - return error; -} - -unsigned lodepng_encode32(unsigned char** out, size_t* outsize, const unsigned char* image, unsigned w, unsigned h) { - return lodepng_encode_memory(out, outsize, image, w, h, LCT_RGBA, 8); -} - -unsigned lodepng_encode24(unsigned char** out, size_t* outsize, const unsigned char* image, unsigned w, unsigned h) { - return lodepng_encode_memory(out, outsize, image, w, h, LCT_RGB, 8); -} - -#ifdef LODEPNG_COMPILE_DISK -unsigned lodepng_encode_file(const char* filename, const unsigned char* image, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) { - unsigned char* buffer; - size_t buffersize; - unsigned error = lodepng_encode_memory(&buffer, &buffersize, image, w, h, colortype, bitdepth); - if(!error) error = lodepng_save_file(buffer, buffersize, filename); - lodepng_free(buffer); - return error; -} - -unsigned lodepng_encode32_file(const char* filename, const unsigned char* image, unsigned w, unsigned h) { - return lodepng_encode_file(filename, image, w, h, LCT_RGBA, 8); -} - -unsigned lodepng_encode24_file(const char* filename, const unsigned char* image, unsigned w, unsigned h) { - return lodepng_encode_file(filename, image, w, h, LCT_RGB, 8); -} -#endif /*LODEPNG_COMPILE_DISK*/ - -void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings) { - lodepng_compress_settings_init(&settings->zlibsettings); - settings->filter_palette_zero = 1; - settings->filter_strategy = LFS_MINSUM; - settings->auto_convert = 1; - settings->force_palette = 0; - settings->predefined_filters = 0; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - settings->add_id = 0; - settings->text_compression = 1; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} - -#endif /*LODEPNG_COMPILE_ENCODER*/ -#endif /*LODEPNG_COMPILE_PNG*/ - -#ifdef LODEPNG_COMPILE_ERROR_TEXT -/* -This returns the description of a numerical error code in English. This is also -the documentation of all the error codes. -*/ -const char* lodepng_error_text(unsigned code) { - switch(code) { - case 0: return "no error, everything went ok"; - case 1: return "nothing done yet"; /*the Encoder/Decoder has done nothing yet, error checking makes no sense yet*/ - case 10: return "end of input memory reached without huffman end code"; /*while huffman decoding*/ - case 11: return "error in code tree made it jump outside of huffman tree"; /*while huffman decoding*/ - case 13: return "problem while processing dynamic deflate block"; - case 14: return "problem while processing dynamic deflate block"; - case 15: return "problem while processing dynamic deflate block"; - /*this error could happen if there are only 0 or 1 symbols present in the huffman code:*/ - case 16: return "invalid code while processing dynamic deflate block"; - case 17: return "end of out buffer memory reached while inflating"; - case 18: return "invalid distance code while inflating"; - case 19: return "end of out buffer memory reached while inflating"; - case 20: return "invalid deflate block BTYPE encountered while decoding"; - case 21: return "NLEN is not ones complement of LEN in a deflate block"; - - /*end of out buffer memory reached while inflating: - This can happen if the inflated deflate data is longer than the amount of bytes required to fill up - all the pixels of the image, given the color depth and image dimensions. Something that doesn't - happen in a normal, well encoded, PNG image.*/ - case 22: return "end of out buffer memory reached while inflating"; - case 23: return "end of in buffer memory reached while inflating"; - case 24: return "invalid FCHECK in zlib header"; - case 25: return "invalid compression method in zlib header"; - case 26: return "FDICT encountered in zlib header while it's not used for PNG"; - case 27: return "PNG file is smaller than a PNG header"; - /*Checks the magic file header, the first 8 bytes of the PNG file*/ - case 28: return "incorrect PNG signature, it's no PNG or corrupted"; - case 29: return "first chunk is not the header chunk"; - case 30: return "chunk length too large, chunk broken off at end of file"; - case 31: return "illegal PNG color type or bpp"; - case 32: return "illegal PNG compression method"; - case 33: return "illegal PNG filter method"; - case 34: return "illegal PNG interlace method"; - case 35: return "chunk length of a chunk is too large or the chunk too small"; - case 36: return "illegal PNG filter type encountered"; - case 37: return "illegal bit depth for this color type given"; - case 38: return "the palette is too small or too big"; /*0, or more than 256 colors*/ - case 39: return "tRNS chunk before PLTE or has more entries than palette size"; - case 40: return "tRNS chunk has wrong size for grayscale image"; - case 41: return "tRNS chunk has wrong size for RGB image"; - case 42: return "tRNS chunk appeared while it was not allowed for this color type"; - case 43: return "bKGD chunk has wrong size for palette image"; - case 44: return "bKGD chunk has wrong size for grayscale image"; - case 45: return "bKGD chunk has wrong size for RGB image"; - case 48: return "empty input buffer given to decoder. Maybe caused by non-existing file?"; - case 49: return "jumped past memory while generating dynamic huffman tree"; - case 50: return "jumped past memory while generating dynamic huffman tree"; - case 51: return "jumped past memory while inflating huffman block"; - case 52: return "jumped past memory while inflating"; - case 53: return "size of zlib data too small"; - case 54: return "repeat symbol in tree while there was no value symbol yet"; - /*jumped past tree while generating huffman tree, this could be when the - tree will have more leaves than symbols after generating it out of the - given lengths. They call this an oversubscribed dynamic bit lengths tree in zlib.*/ - case 55: return "jumped past tree while generating huffman tree"; - case 56: return "given output image colortype or bitdepth not supported for color conversion"; - case 57: return "invalid CRC encountered (checking CRC can be disabled)"; - case 58: return "invalid ADLER32 encountered (checking ADLER32 can be disabled)"; - case 59: return "requested color conversion not supported"; - case 60: return "invalid window size given in the settings of the encoder (must be 0-32768)"; - case 61: return "invalid BTYPE given in the settings of the encoder (only 0, 1 and 2 are allowed)"; - /*LodePNG leaves the choice of RGB to grayscale conversion formula to the user.*/ - case 62: return "conversion from color to grayscale not supported"; - /*(2^31-1)*/ - case 63: return "length of a chunk too long, max allowed for PNG is 2147483647 bytes per chunk"; - /*this would result in the inability of a deflated block to ever contain an end code. It must be at least 1.*/ - case 64: return "the length of the END symbol 256 in the Huffman tree is 0"; - case 66: return "the length of a text chunk keyword given to the encoder is longer than the maximum of 79 bytes"; - case 67: return "the length of a text chunk keyword given to the encoder is smaller than the minimum of 1 byte"; - case 68: return "tried to encode a PLTE chunk with a palette that has less than 1 or more than 256 colors"; - case 69: return "unknown chunk type with 'critical' flag encountered by the decoder"; - case 71: return "invalid interlace mode given to encoder (must be 0 or 1)"; - case 72: return "while decoding, invalid compression method encountering in zTXt or iTXt chunk (it must be 0)"; - case 73: return "invalid tIME chunk size"; - case 74: return "invalid pHYs chunk size"; - /*length could be wrong, or data chopped off*/ - case 75: return "no null termination char found while decoding text chunk"; - case 76: return "iTXt chunk too short to contain required bytes"; - case 77: return "integer overflow in buffer size"; - case 78: return "failed to open file for reading"; /*file doesn't exist or couldn't be opened for reading*/ - case 79: return "failed to open file for writing"; - case 80: return "tried creating a tree of 0 symbols"; - case 81: return "lazy matching at pos 0 is impossible"; - case 82: return "color conversion to palette requested while a color isn't in palette, or index out of bounds"; - case 83: return "memory allocation failed"; - case 84: return "given image too small to contain all pixels to be encoded"; - case 86: return "impossible offset in lz77 encoding (internal bug)"; - case 87: return "must provide custom zlib function pointer if LODEPNG_COMPILE_ZLIB is not defined"; - case 88: return "invalid filter strategy given for LodePNGEncoderSettings.filter_strategy"; - case 89: return "text chunk keyword too short or long: must have size 1-79"; - /*the windowsize in the LodePNGCompressSettings. Requiring POT(==> & instead of %) makes encoding 12% faster.*/ - case 90: return "windowsize must be a power of two"; - case 91: return "invalid decompressed idat size"; - case 92: return "integer overflow due to too many pixels"; - case 93: return "zero width or height is invalid"; - case 94: return "header chunk must have a size of 13 bytes"; - case 95: return "integer overflow with combined idat chunk size"; - case 96: return "invalid gAMA chunk size"; - case 97: return "invalid cHRM chunk size"; - case 98: return "invalid sRGB chunk size"; - case 99: return "invalid sRGB rendering intent"; - case 100: return "invalid ICC profile color type, the PNG specification only allows RGB or GRAY"; - case 101: return "PNG specification does not allow RGB ICC profile on gray color types and vice versa"; - case 102: return "not allowed to set grayscale ICC profile with colored pixels by PNG specification"; - case 103: return "invalid palette index in bKGD chunk. Maybe it came before PLTE chunk?"; - case 104: return "invalid bKGD color while encoding (e.g. palette index out of range)"; - case 105: return "integer overflow of bitsize"; - case 106: return "PNG file must have PLTE chunk if color type is palette"; - case 107: return "color convert from palette mode requested without setting the palette data in it"; - case 108: return "tried to add more than 256 values to a palette"; - /*this limit can be configured in LodePNGDecompressSettings*/ - case 109: return "tried to decompress zlib or deflate data larger than desired max_output_size"; - case 110: return "custom zlib or inflate decompression failed"; - case 111: return "custom zlib or deflate compression failed"; - /*max text size limit can be configured in LodePNGDecoderSettings. This error prevents - unreasonable memory consumption when decoding due to impossibly large text sizes.*/ - case 112: return "compressed text unreasonably large"; - /*max ICC size limit can be configured in LodePNGDecoderSettings. This error prevents - unreasonable memory consumption when decoding due to impossibly large ICC profile*/ - case 113: return "ICC profile unreasonably large"; - } - return "unknown error code"; -} -#endif /*LODEPNG_COMPILE_ERROR_TEXT*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* // C++ Wrapper // */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_CPP -namespace lodepng { - -#ifdef LODEPNG_COMPILE_DISK -unsigned load_file(std::vector& buffer, const std::string& filename) { - long size = lodepng_filesize(filename.c_str()); - if(size < 0) return 78; - buffer.resize((size_t)size); - return size == 0 ? 0 : lodepng_buffer_file(&buffer[0], (size_t)size, filename.c_str()); -} - -/*write given buffer to the file, overwriting the file, it doesn't append to it.*/ -unsigned save_file(const std::vector& buffer, const std::string& filename) { - return lodepng_save_file(buffer.empty() ? 0 : &buffer[0], buffer.size(), filename.c_str()); -} -#endif /* LODEPNG_COMPILE_DISK */ - -#ifdef LODEPNG_COMPILE_ZLIB -#ifdef LODEPNG_COMPILE_DECODER -unsigned decompress(std::vector& out, const unsigned char* in, size_t insize, - const LodePNGDecompressSettings& settings) { - unsigned char* buffer = 0; - size_t buffersize = 0; - unsigned error = zlib_decompress(&buffer, &buffersize, 0, in, insize, &settings); - if(buffer) { - out.insert(out.end(), &buffer[0], &buffer[buffersize]); - lodepng_free(buffer); - } - return error; -} - -unsigned decompress(std::vector& out, const std::vector& in, - const LodePNGDecompressSettings& settings) { - return decompress(out, in.empty() ? 0 : &in[0], in.size(), settings); -} -#endif /* LODEPNG_COMPILE_DECODER */ - -#ifdef LODEPNG_COMPILE_ENCODER -unsigned compress(std::vector& out, const unsigned char* in, size_t insize, - const LodePNGCompressSettings& settings) { - unsigned char* buffer = 0; - size_t buffersize = 0; - unsigned error = zlib_compress(&buffer, &buffersize, in, insize, &settings); - if(buffer) { - out.insert(out.end(), &buffer[0], &buffer[buffersize]); - lodepng_free(buffer); - } - return error; -} - -unsigned compress(std::vector& out, const std::vector& in, - const LodePNGCompressSettings& settings) { - return compress(out, in.empty() ? 0 : &in[0], in.size(), settings); -} -#endif /* LODEPNG_COMPILE_ENCODER */ -#endif /* LODEPNG_COMPILE_ZLIB */ - - -#ifdef LODEPNG_COMPILE_PNG - -State::State() { - lodepng_state_init(this); -} - -State::State(const State& other) { - lodepng_state_init(this); - lodepng_state_copy(this, &other); -} - -State::~State() { - lodepng_state_cleanup(this); -} - -State& State::operator=(const State& other) { - lodepng_state_copy(this, &other); - return *this; -} - -#ifdef LODEPNG_COMPILE_DECODER - -unsigned decode(std::vector& out, unsigned& w, unsigned& h, const unsigned char* in, - size_t insize, LodePNGColorType colortype, unsigned bitdepth) { - unsigned char* buffer = 0; - unsigned error = lodepng_decode_memory(&buffer, &w, &h, in, insize, colortype, bitdepth); - if(buffer && !error) { - State state; - state.info_raw.colortype = colortype; - state.info_raw.bitdepth = bitdepth; - size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw); - out.insert(out.end(), &buffer[0], &buffer[buffersize]); - } - lodepng_free(buffer); - return error; -} - -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - const std::vector& in, LodePNGColorType colortype, unsigned bitdepth) { - return decode(out, w, h, in.empty() ? 0 : &in[0], (unsigned)in.size(), colortype, bitdepth); -} - -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - State& state, - const unsigned char* in, size_t insize) { - unsigned char* buffer = NULL; - unsigned error = lodepng_decode(&buffer, &w, &h, &state, in, insize); - if(buffer && !error) { - size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw); - out.insert(out.end(), &buffer[0], &buffer[buffersize]); - } - lodepng_free(buffer); - return error; -} - -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - State& state, - const std::vector& in) { - return decode(out, w, h, state, in.empty() ? 0 : &in[0], in.size()); -} - -#ifdef LODEPNG_COMPILE_DISK -unsigned decode(std::vector& out, unsigned& w, unsigned& h, const std::string& filename, - LodePNGColorType colortype, unsigned bitdepth) { - std::vector buffer; - /* safe output values in case error happens */ - w = h = 0; - unsigned error = load_file(buffer, filename); - if(error) return error; - return decode(out, w, h, buffer, colortype, bitdepth); -} -#endif /* LODEPNG_COMPILE_DECODER */ -#endif /* LODEPNG_COMPILE_DISK */ - -#ifdef LODEPNG_COMPILE_ENCODER -unsigned encode(std::vector& out, const unsigned char* in, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) { - unsigned char* buffer; - size_t buffersize; - unsigned error = lodepng_encode_memory(&buffer, &buffersize, in, w, h, colortype, bitdepth); - if(buffer) { - out.insert(out.end(), &buffer[0], &buffer[buffersize]); - lodepng_free(buffer); - } - return error; -} - -unsigned encode(std::vector& out, - const std::vector& in, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) { - if(lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) return 84; - return encode(out, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth); -} - -unsigned encode(std::vector& out, - const unsigned char* in, unsigned w, unsigned h, - State& state) { - unsigned char* buffer; - size_t buffersize; - unsigned error = lodepng_encode(&buffer, &buffersize, in, w, h, &state); - if(buffer) { - out.insert(out.end(), &buffer[0], &buffer[buffersize]); - lodepng_free(buffer); - } - return error; -} - -unsigned encode(std::vector& out, - const std::vector& in, unsigned w, unsigned h, - State& state) { - if(lodepng_get_raw_size(w, h, &state.info_raw) > in.size()) return 84; - return encode(out, in.empty() ? 0 : &in[0], w, h, state); -} - -#ifdef LODEPNG_COMPILE_DISK -unsigned encode(const std::string& filename, - const unsigned char* in, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) { - std::vector buffer; - unsigned error = encode(buffer, in, w, h, colortype, bitdepth); - if(!error) error = save_file(buffer, filename); - return error; -} - -unsigned encode(const std::string& filename, - const std::vector& in, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) { - if(lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) return 84; - return encode(filename, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth); -} -#endif /* LODEPNG_COMPILE_DISK */ -#endif /* LODEPNG_COMPILE_ENCODER */ -#endif /* LODEPNG_COMPILE_PNG */ -} /* namespace lodepng */ -#endif /*LODEPNG_COMPILE_CPP*/ diff --git a/tools/lodepng/lodepng.h b/tools/lodepng/lodepng.h deleted file mode 100644 index 3e1da92de41..00000000000 --- a/tools/lodepng/lodepng.h +++ /dev/null @@ -1,2019 +0,0 @@ -/* -LodePNG version 20210627 - -Copyright (c) 2005-2021 Lode Vandevenne - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*/ - -#ifndef LODEPNG_H -#define LODEPNG_H - -#include /*for size_t*/ - -extern const char* LODEPNG_VERSION_STRING; - -/* -The following #defines are used to create code sections. They can be disabled -to disable code sections, which can give faster compile time and smaller binary. -The "NO_COMPILE" defines are designed to be used to pass as defines to the -compiler command to disable them without modifying this header, e.g. --DLODEPNG_NO_COMPILE_ZLIB for gcc. -In addition to those below, you can also define LODEPNG_NO_COMPILE_CRC to -allow implementing a custom lodepng_crc32. -*/ -/*deflate & zlib. If disabled, you must specify alternative zlib functions in -the custom_zlib field of the compress and decompress settings*/ -#ifndef LODEPNG_NO_COMPILE_ZLIB -#define LODEPNG_COMPILE_ZLIB -#endif - -/*png encoder and png decoder*/ -#ifndef LODEPNG_NO_COMPILE_PNG -#define LODEPNG_COMPILE_PNG -#endif - -/*deflate&zlib decoder and png decoder*/ -#ifndef LODEPNG_NO_COMPILE_DECODER -#define LODEPNG_COMPILE_DECODER -#endif - -/*deflate&zlib encoder and png encoder*/ -#ifndef LODEPNG_NO_COMPILE_ENCODER -#define LODEPNG_COMPILE_ENCODER -#endif - -/*the optional built in harddisk file loading and saving functions*/ -#ifndef LODEPNG_NO_COMPILE_DISK -#define LODEPNG_COMPILE_DISK -#endif - -/*support for chunks other than IHDR, IDAT, PLTE, tRNS, IEND: ancillary and unknown chunks*/ -#ifndef LODEPNG_NO_COMPILE_ANCILLARY_CHUNKS -#define LODEPNG_COMPILE_ANCILLARY_CHUNKS -#endif - -/*ability to convert error numerical codes to English text string*/ -#ifndef LODEPNG_NO_COMPILE_ERROR_TEXT -#define LODEPNG_COMPILE_ERROR_TEXT -#endif - -/*Compile the default allocators (C's free, malloc and realloc). If you disable this, -you can define the functions lodepng_free, lodepng_malloc and lodepng_realloc in your -source files with custom allocators.*/ -#ifndef LODEPNG_NO_COMPILE_ALLOCATORS -#define LODEPNG_COMPILE_ALLOCATORS -#endif - -/*compile the C++ version (you can disable the C++ wrapper here even when compiling for C++)*/ -#ifdef __cplusplus -#ifndef LODEPNG_NO_COMPILE_CPP -#define LODEPNG_COMPILE_CPP -#endif -#endif - -#ifdef LODEPNG_COMPILE_CPP -#include -#include -#endif /*LODEPNG_COMPILE_CPP*/ - -#ifdef LODEPNG_COMPILE_PNG -/*The PNG color types (also used for raw image).*/ -typedef enum LodePNGColorType { - LCT_GREY = 0, /*grayscale: 1,2,4,8,16 bit*/ - LCT_RGB = 2, /*RGB: 8,16 bit*/ - LCT_PALETTE = 3, /*palette: 1,2,4,8 bit*/ - LCT_GREY_ALPHA = 4, /*grayscale with alpha: 8,16 bit*/ - LCT_RGBA = 6, /*RGB with alpha: 8,16 bit*/ - /*LCT_MAX_OCTET_VALUE lets the compiler allow this enum to represent any invalid - byte value from 0 to 255 that could be present in an invalid PNG file header. Do - not use, compare with or set the name LCT_MAX_OCTET_VALUE, instead either use - the valid color type names above, or numeric values like 1 or 7 when checking for - particular disallowed color type byte values, or cast to integer to print it.*/ - LCT_MAX_OCTET_VALUE = 255 -} LodePNGColorType; - -#ifdef LODEPNG_COMPILE_DECODER -/* -Converts PNG data in memory to raw pixel data. -out: Output parameter. Pointer to buffer that will contain the raw pixel data. - After decoding, its size is w * h * (bytes per pixel) bytes larger than - initially. Bytes per pixel depends on colortype and bitdepth. - Must be freed after usage with free(*out). - Note: for 16-bit per channel colors, uses big endian format like PNG does. -w: Output parameter. Pointer to width of pixel data. -h: Output parameter. Pointer to height of pixel data. -in: Memory buffer with the PNG file. -insize: size of the in buffer. -colortype: the desired color type for the raw output image. See explanation on PNG color types. -bitdepth: the desired bit depth for the raw output image. See explanation on PNG color types. -Return value: LodePNG error code (0 means no error). -*/ -unsigned lodepng_decode_memory(unsigned char** out, unsigned* w, unsigned* h, - const unsigned char* in, size_t insize, - LodePNGColorType colortype, unsigned bitdepth); - -/*Same as lodepng_decode_memory, but always decodes to 32-bit RGBA raw image*/ -unsigned lodepng_decode32(unsigned char** out, unsigned* w, unsigned* h, - const unsigned char* in, size_t insize); - -/*Same as lodepng_decode_memory, but always decodes to 24-bit RGB raw image*/ -unsigned lodepng_decode24(unsigned char** out, unsigned* w, unsigned* h, - const unsigned char* in, size_t insize); - -#ifdef LODEPNG_COMPILE_DISK -/* -Load PNG from disk, from file with given name. -Same as the other decode functions, but instead takes a filename as input. - -NOTE: Wide-character filenames are not supported, you can use an external method -to handle such files and decode in-memory.*/ -unsigned lodepng_decode_file(unsigned char** out, unsigned* w, unsigned* h, - const char* filename, - LodePNGColorType colortype, unsigned bitdepth); - -/*Same as lodepng_decode_file, but always decodes to 32-bit RGBA raw image. - -NOTE: Wide-character filenames are not supported, you can use an external method -to handle such files and decode in-memory.*/ -unsigned lodepng_decode32_file(unsigned char** out, unsigned* w, unsigned* h, - const char* filename); - -/*Same as lodepng_decode_file, but always decodes to 24-bit RGB raw image. - -NOTE: Wide-character filenames are not supported, you can use an external method -to handle such files and decode in-memory.*/ -unsigned lodepng_decode24_file(unsigned char** out, unsigned* w, unsigned* h, - const char* filename); -#endif /*LODEPNG_COMPILE_DISK*/ -#endif /*LODEPNG_COMPILE_DECODER*/ - - -#ifdef LODEPNG_COMPILE_ENCODER -/* -Converts raw pixel data into a PNG image in memory. The colortype and bitdepth - of the output PNG image cannot be chosen, they are automatically determined - by the colortype, bitdepth and content of the input pixel data. - Note: for 16-bit per channel colors, needs big endian format like PNG does. -out: Output parameter. Pointer to buffer that will contain the PNG image data. - Must be freed after usage with free(*out). -outsize: Output parameter. Pointer to the size in bytes of the out buffer. -image: The raw pixel data to encode. The size of this buffer should be - w * h * (bytes per pixel), bytes per pixel depends on colortype and bitdepth. -w: width of the raw pixel data in pixels. -h: height of the raw pixel data in pixels. -colortype: the color type of the raw input image. See explanation on PNG color types. -bitdepth: the bit depth of the raw input image. See explanation on PNG color types. -Return value: LodePNG error code (0 means no error). -*/ -unsigned lodepng_encode_memory(unsigned char** out, size_t* outsize, - const unsigned char* image, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth); - -/*Same as lodepng_encode_memory, but always encodes from 32-bit RGBA raw image.*/ -unsigned lodepng_encode32(unsigned char** out, size_t* outsize, - const unsigned char* image, unsigned w, unsigned h); - -/*Same as lodepng_encode_memory, but always encodes from 24-bit RGB raw image.*/ -unsigned lodepng_encode24(unsigned char** out, size_t* outsize, - const unsigned char* image, unsigned w, unsigned h); - -#ifdef LODEPNG_COMPILE_DISK -/* -Converts raw pixel data into a PNG file on disk. -Same as the other encode functions, but instead takes a filename as output. - -NOTE: This overwrites existing files without warning! - -NOTE: Wide-character filenames are not supported, you can use an external method -to handle such files and encode in-memory.*/ -unsigned lodepng_encode_file(const char* filename, - const unsigned char* image, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth); - -/*Same as lodepng_encode_file, but always encodes from 32-bit RGBA raw image. - -NOTE: Wide-character filenames are not supported, you can use an external method -to handle such files and encode in-memory.*/ -unsigned lodepng_encode32_file(const char* filename, - const unsigned char* image, unsigned w, unsigned h); - -/*Same as lodepng_encode_file, but always encodes from 24-bit RGB raw image. - -NOTE: Wide-character filenames are not supported, you can use an external method -to handle such files and encode in-memory.*/ -unsigned lodepng_encode24_file(const char* filename, - const unsigned char* image, unsigned w, unsigned h); -#endif /*LODEPNG_COMPILE_DISK*/ -#endif /*LODEPNG_COMPILE_ENCODER*/ - - -#ifdef LODEPNG_COMPILE_CPP -namespace lodepng { -#ifdef LODEPNG_COMPILE_DECODER -/*Same as lodepng_decode_memory, but decodes to an std::vector. The colortype -is the format to output the pixels to. Default is RGBA 8-bit per channel.*/ -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - const unsigned char* in, size_t insize, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - const std::vector& in, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -#ifdef LODEPNG_COMPILE_DISK -/* -Converts PNG file from disk to raw pixel data in memory. -Same as the other decode functions, but instead takes a filename as input. - -NOTE: Wide-character filenames are not supported, you can use an external method -to handle such files and decode in-memory. -*/ -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - const std::string& filename, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -#endif /* LODEPNG_COMPILE_DISK */ -#endif /* LODEPNG_COMPILE_DECODER */ - -#ifdef LODEPNG_COMPILE_ENCODER -/*Same as lodepng_encode_memory, but encodes to an std::vector. colortype -is that of the raw input data. The output PNG color type will be auto chosen.*/ -unsigned encode(std::vector& out, - const unsigned char* in, unsigned w, unsigned h, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -unsigned encode(std::vector& out, - const std::vector& in, unsigned w, unsigned h, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -#ifdef LODEPNG_COMPILE_DISK -/* -Converts 32-bit RGBA raw pixel data into a PNG file on disk. -Same as the other encode functions, but instead takes a filename as output. - -NOTE: This overwrites existing files without warning! - -NOTE: Wide-character filenames are not supported, you can use an external method -to handle such files and decode in-memory. -*/ -unsigned encode(const std::string& filename, - const unsigned char* in, unsigned w, unsigned h, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -unsigned encode(const std::string& filename, - const std::vector& in, unsigned w, unsigned h, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -#endif /* LODEPNG_COMPILE_DISK */ -#endif /* LODEPNG_COMPILE_ENCODER */ -} /* namespace lodepng */ -#endif /*LODEPNG_COMPILE_CPP*/ -#endif /*LODEPNG_COMPILE_PNG*/ - -#ifdef LODEPNG_COMPILE_ERROR_TEXT -/*Returns an English description of the numerical error code.*/ -const char* lodepng_error_text(unsigned code); -#endif /*LODEPNG_COMPILE_ERROR_TEXT*/ - -#ifdef LODEPNG_COMPILE_DECODER -/*Settings for zlib decompression*/ -typedef struct LodePNGDecompressSettings LodePNGDecompressSettings; -struct LodePNGDecompressSettings { - /* Check LodePNGDecoderSettings for more ignorable errors such as ignore_crc */ - unsigned ignore_adler32; /*if 1, continue and don't give an error message if the Adler32 checksum is corrupted*/ - unsigned ignore_nlen; /*ignore complement of len checksum in uncompressed blocks*/ - - /*Maximum decompressed size, beyond this the decoder may (and is encouraged to) stop decoding, - return an error, output a data size > max_output_size and all the data up to that point. This is - not hard limit nor a guarantee, but can prevent excessive memory usage. This setting is - ignored by the PNG decoder, but is used by the deflate/zlib decoder and can be used by custom ones. - Set to 0 to impose no limit (the default).*/ - size_t max_output_size; - - /*use custom zlib decoder instead of built in one (default: null). - Should return 0 if success, any non-0 if error (numeric value not exposed).*/ - unsigned (*custom_zlib)(unsigned char**, size_t*, - const unsigned char*, size_t, - const LodePNGDecompressSettings*); - /*use custom deflate decoder instead of built in one (default: null) - if custom_zlib is not null, custom_inflate is ignored (the zlib format uses deflate). - Should return 0 if success, any non-0 if error (numeric value not exposed).*/ - unsigned (*custom_inflate)(unsigned char**, size_t*, - const unsigned char*, size_t, - const LodePNGDecompressSettings*); - - const void* custom_context; /*optional custom settings for custom functions*/ -}; - -extern const LodePNGDecompressSettings lodepng_default_decompress_settings; -void lodepng_decompress_settings_init(LodePNGDecompressSettings* settings); -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -/* -Settings for zlib compression. Tweaking these settings tweaks the balance -between speed and compression ratio. -*/ -typedef struct LodePNGCompressSettings LodePNGCompressSettings; -struct LodePNGCompressSettings /*deflate = compress*/ { - /*LZ77 related settings*/ - unsigned btype; /*the block type for LZ (0, 1, 2 or 3, see zlib standard). Should be 2 for proper compression.*/ - unsigned use_lz77; /*whether or not to use LZ77. Should be 1 for proper compression.*/ - unsigned windowsize; /*must be a power of two <= 32768. higher compresses more but is slower. Default value: 2048.*/ - unsigned minmatch; /*minimum lz77 length. 3 is normally best, 6 can be better for some PNGs. Default: 0*/ - unsigned nicematch; /*stop searching if >= this length found. Set to 258 for best compression. Default: 128*/ - unsigned lazymatching; /*use lazy matching: better compression but a bit slower. Default: true*/ - - /*use custom zlib encoder instead of built in one (default: null)*/ - unsigned (*custom_zlib)(unsigned char**, size_t*, - const unsigned char*, size_t, - const LodePNGCompressSettings*); - /*use custom deflate encoder instead of built in one (default: null) - if custom_zlib is used, custom_deflate is ignored since only the built in - zlib function will call custom_deflate*/ - unsigned (*custom_deflate)(unsigned char**, size_t*, - const unsigned char*, size_t, - const LodePNGCompressSettings*); - - const void* custom_context; /*optional custom settings for custom functions*/ -}; - -extern const LodePNGCompressSettings lodepng_default_compress_settings; -void lodepng_compress_settings_init(LodePNGCompressSettings* settings); -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#ifdef LODEPNG_COMPILE_PNG -/* -Color mode of an image. Contains all information required to decode the pixel -bits to RGBA colors. This information is the same as used in the PNG file -format, and is used both for PNG and raw image data in LodePNG. -*/ -typedef struct LodePNGColorMode { - /*header (IHDR)*/ - LodePNGColorType colortype; /*color type, see PNG standard or documentation further in this header file*/ - unsigned bitdepth; /*bits per sample, see PNG standard or documentation further in this header file*/ - - /* - palette (PLTE and tRNS) - - Dynamically allocated with the colors of the palette, including alpha. - This field may not be allocated directly, use lodepng_color_mode_init first, - then lodepng_palette_add per color to correctly initialize it (to ensure size - of exactly 1024 bytes). - - The alpha channels must be set as well, set them to 255 for opaque images. - - When decoding, by default you can ignore this palette, since LodePNG already - fills the palette colors in the pixels of the raw RGBA output. - - The palette is only supported for color type 3. - */ - unsigned char* palette; /*palette in RGBARGBA... order. Must be either 0, or when allocated must have 1024 bytes*/ - size_t palettesize; /*palette size in number of colors (amount of used bytes is 4 * palettesize)*/ - - /* - transparent color key (tRNS) - - This color uses the same bit depth as the bitdepth value in this struct, which can be 1-bit to 16-bit. - For grayscale PNGs, r, g and b will all 3 be set to the same. - - When decoding, by default you can ignore this information, since LodePNG sets - pixels with this key to transparent already in the raw RGBA output. - - The color key is only supported for color types 0 and 2. - */ - unsigned key_defined; /*is a transparent color key given? 0 = false, 1 = true*/ - unsigned key_r; /*red/grayscale component of color key*/ - unsigned key_g; /*green component of color key*/ - unsigned key_b; /*blue component of color key*/ -} LodePNGColorMode; - -/*init, cleanup and copy functions to use with this struct*/ -void lodepng_color_mode_init(LodePNGColorMode* info); -void lodepng_color_mode_cleanup(LodePNGColorMode* info); -/*return value is error code (0 means no error)*/ -unsigned lodepng_color_mode_copy(LodePNGColorMode* dest, const LodePNGColorMode* source); -/* Makes a temporary LodePNGColorMode that does not need cleanup (no palette) */ -LodePNGColorMode lodepng_color_mode_make(LodePNGColorType colortype, unsigned bitdepth); - -void lodepng_palette_clear(LodePNGColorMode* info); -/*add 1 color to the palette*/ -unsigned lodepng_palette_add(LodePNGColorMode* info, - unsigned char r, unsigned char g, unsigned char b, unsigned char a); - -/*get the total amount of bits per pixel, based on colortype and bitdepth in the struct*/ -unsigned lodepng_get_bpp(const LodePNGColorMode* info); -/*get the amount of color channels used, based on colortype in the struct. -If a palette is used, it counts as 1 channel.*/ -unsigned lodepng_get_channels(const LodePNGColorMode* info); -/*is it a grayscale type? (only colortype 0 or 4)*/ -unsigned lodepng_is_greyscale_type(const LodePNGColorMode* info); -/*has it got an alpha channel? (only colortype 2 or 6)*/ -unsigned lodepng_is_alpha_type(const LodePNGColorMode* info); -/*has it got a palette? (only colortype 3)*/ -unsigned lodepng_is_palette_type(const LodePNGColorMode* info); -/*only returns true if there is a palette and there is a value in the palette with alpha < 255. -Loops through the palette to check this.*/ -unsigned lodepng_has_palette_alpha(const LodePNGColorMode* info); -/* -Check if the given color info indicates the possibility of having non-opaque pixels in the PNG image. -Returns true if the image can have translucent or invisible pixels (it still be opaque if it doesn't use such pixels). -Returns false if the image can only have opaque pixels. -In detail, it returns true only if it's a color type with alpha, or has a palette with non-opaque values, -or if "key_defined" is true. -*/ -unsigned lodepng_can_have_alpha(const LodePNGColorMode* info); -/*Returns the byte size of a raw image buffer with given width, height and color mode*/ -size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* color); - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -/*The information of a Time chunk in PNG.*/ -typedef struct LodePNGTime { - unsigned year; /*2 bytes used (0-65535)*/ - unsigned month; /*1-12*/ - unsigned day; /*1-31*/ - unsigned hour; /*0-23*/ - unsigned minute; /*0-59*/ - unsigned second; /*0-60 (to allow for leap seconds)*/ -} LodePNGTime; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -/*Information about the PNG image, except pixels, width and height.*/ -typedef struct LodePNGInfo { - /*header (IHDR), palette (PLTE) and transparency (tRNS) chunks*/ - unsigned compression_method;/*compression method of the original file. Always 0.*/ - unsigned filter_method; /*filter method of the original file*/ - unsigned interlace_method; /*interlace method of the original file: 0=none, 1=Adam7*/ - LodePNGColorMode color; /*color type and bits, palette and transparency of the PNG file*/ - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /* - Suggested background color chunk (bKGD) - - This uses the same color mode and bit depth as the PNG (except no alpha channel), - with values truncated to the bit depth in the unsigned integer. - - For grayscale and palette PNGs, the value is stored in background_r. The values - in background_g and background_b are then unused. - - So when decoding, you may get these in a different color mode than the one you requested - for the raw pixels. - - When encoding with auto_convert, you must use the color model defined in info_png.color for - these values. The encoder normally ignores info_png.color when auto_convert is on, but will - use it to interpret these values (and convert copies of them to its chosen color model). - - When encoding, avoid setting this to an expensive color, such as a non-gray value - when the image is gray, or the compression will be worse since it will be forced to - write the PNG with a more expensive color mode (when auto_convert is on). - - The decoder does not use this background color to edit the color of pixels. This is a - completely optional metadata feature. - */ - unsigned background_defined; /*is a suggested background color given?*/ - unsigned background_r; /*red/gray/palette component of suggested background color*/ - unsigned background_g; /*green component of suggested background color*/ - unsigned background_b; /*blue component of suggested background color*/ - - /* - Non-international text chunks (tEXt and zTXt) - - The char** arrays each contain num strings. The actual messages are in - text_strings, while text_keys are keywords that give a short description what - the actual text represents, e.g. Title, Author, Description, or anything else. - - All the string fields below including strings, keys, names and language tags are null terminated. - The PNG specification uses null characters for the keys, names and tags, and forbids null - characters to appear in the main text which is why we can use null termination everywhere here. - - A keyword is minimum 1 character and maximum 79 characters long (plus the - additional null terminator). It's discouraged to use a single line length - longer than 79 characters for texts. - - Don't allocate these text buffers yourself. Use the init/cleanup functions - correctly and use lodepng_add_text and lodepng_clear_text. - - Standard text chunk keywords and strings are encoded using Latin-1. - */ - size_t text_num; /*the amount of texts in these char** buffers (there may be more texts in itext)*/ - char** text_keys; /*the keyword of a text chunk (e.g. "Comment")*/ - char** text_strings; /*the actual text*/ - - /* - International text chunks (iTXt) - Similar to the non-international text chunks, but with additional strings - "langtags" and "transkeys", and the following text encodings are used: - keys: Latin-1, langtags: ASCII, transkeys and strings: UTF-8. - keys must be 1-79 characters (plus the additional null terminator), the other - strings are any length. - */ - size_t itext_num; /*the amount of international texts in this PNG*/ - char** itext_keys; /*the English keyword of the text chunk (e.g. "Comment")*/ - char** itext_langtags; /*language tag for this text's language, ISO/IEC 646 string, e.g. ISO 639 language tag*/ - char** itext_transkeys; /*keyword translated to the international language - UTF-8 string*/ - char** itext_strings; /*the actual international text - UTF-8 string*/ - - /*time chunk (tIME)*/ - unsigned time_defined; /*set to 1 to make the encoder generate a tIME chunk*/ - LodePNGTime time; - - /*phys chunk (pHYs)*/ - unsigned phys_defined; /*if 0, there is no pHYs chunk and the values below are undefined, if 1 else there is one*/ - unsigned phys_x; /*pixels per unit in x direction*/ - unsigned phys_y; /*pixels per unit in y direction*/ - unsigned phys_unit; /*may be 0 (unknown unit) or 1 (metre)*/ - - /* - Color profile related chunks: gAMA, cHRM, sRGB, iCPP - - LodePNG does not apply any color conversions on pixels in the encoder or decoder and does not interpret these color - profile values. It merely passes on the information. If you wish to use color profiles and convert colors, please - use these values with a color management library. - - See the PNG, ICC and sRGB specifications for more information about the meaning of these values. - */ - - /* gAMA chunk: optional, overridden by sRGB or iCCP if those are present. */ - unsigned gama_defined; /* Whether a gAMA chunk is present (0 = not present, 1 = present). */ - unsigned gama_gamma; /* Gamma exponent times 100000 */ - - /* cHRM chunk: optional, overridden by sRGB or iCCP if those are present. */ - unsigned chrm_defined; /* Whether a cHRM chunk is present (0 = not present, 1 = present). */ - unsigned chrm_white_x; /* White Point x times 100000 */ - unsigned chrm_white_y; /* White Point y times 100000 */ - unsigned chrm_red_x; /* Red x times 100000 */ - unsigned chrm_red_y; /* Red y times 100000 */ - unsigned chrm_green_x; /* Green x times 100000 */ - unsigned chrm_green_y; /* Green y times 100000 */ - unsigned chrm_blue_x; /* Blue x times 100000 */ - unsigned chrm_blue_y; /* Blue y times 100000 */ - - /* - sRGB chunk: optional. May not appear at the same time as iCCP. - If gAMA is also present gAMA must contain value 45455. - If cHRM is also present cHRM must contain respectively 31270,32900,64000,33000,30000,60000,15000,6000. - */ - unsigned srgb_defined; /* Whether an sRGB chunk is present (0 = not present, 1 = present). */ - unsigned srgb_intent; /* Rendering intent: 0=perceptual, 1=rel. colorimetric, 2=saturation, 3=abs. colorimetric */ - - /* - iCCP chunk: optional. May not appear at the same time as sRGB. - - LodePNG does not parse or use the ICC profile (except its color space header field for an edge case), a - separate library to handle the ICC data (not included in LodePNG) format is needed to use it for color - management and conversions. - - For encoding, if iCCP is present, gAMA and cHRM are recommended to be added as well with values that match the ICC - profile as closely as possible, if you wish to do this you should provide the correct values for gAMA and cHRM and - enable their '_defined' flags since LodePNG will not automatically compute them from the ICC profile. - - For encoding, the ICC profile is required by the PNG specification to be an "RGB" profile for non-gray - PNG color types and a "GRAY" profile for gray PNG color types. If you disable auto_convert, you must ensure - the ICC profile type matches your requested color type, else the encoder gives an error. If auto_convert is - enabled (the default), and the ICC profile is not a good match for the pixel data, this will result in an encoder - error if the pixel data has non-gray pixels for a GRAY profile, or a silent less-optimal compression of the pixel - data if the pixels could be encoded as grayscale but the ICC profile is RGB. - - To avoid this do not set an ICC profile in the image unless there is a good reason for it, and when doing so - make sure you compute it carefully to avoid the above problems. - */ - unsigned iccp_defined; /* Whether an iCCP chunk is present (0 = not present, 1 = present). */ - char* iccp_name; /* Null terminated string with profile name, 1-79 bytes */ - /* - The ICC profile in iccp_profile_size bytes. - Don't allocate this buffer yourself. Use the init/cleanup functions - correctly and use lodepng_set_icc and lodepng_clear_icc. - */ - unsigned char* iccp_profile; - unsigned iccp_profile_size; /* The size of iccp_profile in bytes */ - - /* End of color profile related chunks */ - - - /* - unknown chunks: chunks not known by LodePNG, passed on byte for byte. - - There are 3 buffers, one for each position in the PNG where unknown chunks can appear. - Each buffer contains all unknown chunks for that position consecutively. - The 3 positions are: - 0: between IHDR and PLTE, 1: between PLTE and IDAT, 2: between IDAT and IEND. - - For encoding, do not store critical chunks or known chunks that are enabled with a "_defined" flag - above in here, since the encoder will blindly follow this and could then encode an invalid PNG file - (such as one with two IHDR chunks or the disallowed combination of sRGB with iCCP). But do use - this if you wish to store an ancillary chunk that is not supported by LodePNG (such as sPLT or hIST), - or any non-standard PNG chunk. - - Do not allocate or traverse this data yourself. Use the chunk traversing functions declared - later, such as lodepng_chunk_next and lodepng_chunk_append, to read/write this struct. - */ - unsigned char* unknown_chunks_data[3]; - size_t unknown_chunks_size[3]; /*size in bytes of the unknown chunks, given for protection*/ -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} LodePNGInfo; - -/*init, cleanup and copy functions to use with this struct*/ -void lodepng_info_init(LodePNGInfo* info); -void lodepng_info_cleanup(LodePNGInfo* info); -/*return value is error code (0 means no error)*/ -unsigned lodepng_info_copy(LodePNGInfo* dest, const LodePNGInfo* source); - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -unsigned lodepng_add_text(LodePNGInfo* info, const char* key, const char* str); /*push back both texts at once*/ -void lodepng_clear_text(LodePNGInfo* info); /*use this to clear the texts again after you filled them in*/ - -unsigned lodepng_add_itext(LodePNGInfo* info, const char* key, const char* langtag, - const char* transkey, const char* str); /*push back the 4 texts of 1 chunk at once*/ -void lodepng_clear_itext(LodePNGInfo* info); /*use this to clear the itexts again after you filled them in*/ - -/*replaces if exists*/ -unsigned lodepng_set_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size); -void lodepng_clear_icc(LodePNGInfo* info); /*use this to clear the texts again after you filled them in*/ -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -/* -Converts raw buffer from one color type to another color type, based on -LodePNGColorMode structs to describe the input and output color type. -See the reference manual at the end of this header file to see which color conversions are supported. -return value = LodePNG error code (0 if all went ok, an error if the conversion isn't supported) -The out buffer must have size (w * h * bpp + 7) / 8, where bpp is the bits per pixel -of the output color type (lodepng_get_bpp). -For < 8 bpp images, there should not be padding bits at the end of scanlines. -For 16-bit per channel colors, uses big endian format like PNG does. -Return value is LodePNG error code -*/ -unsigned lodepng_convert(unsigned char* out, const unsigned char* in, - const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in, - unsigned w, unsigned h); - -#ifdef LODEPNG_COMPILE_DECODER -/* -Settings for the decoder. This contains settings for the PNG and the Zlib -decoder, but not the Info settings from the Info structs. -*/ -typedef struct LodePNGDecoderSettings { - LodePNGDecompressSettings zlibsettings; /*in here is the setting to ignore Adler32 checksums*/ - - /* Check LodePNGDecompressSettings for more ignorable errors such as ignore_adler32 */ - unsigned ignore_crc; /*ignore CRC checksums*/ - unsigned ignore_critical; /*ignore unknown critical chunks*/ - unsigned ignore_end; /*ignore issues at end of file if possible (missing IEND chunk, too large chunk, ...)*/ - /* TODO: make a system involving warnings with levels and a strict mode instead. Other potentially recoverable - errors: srgb rendering intent value, size of content of ancillary chunks, more than 79 characters for some - strings, placement/combination rules for ancillary chunks, crc of unknown chunks, allowed characters - in string keys, etc... */ - - unsigned color_convert; /*whether to convert the PNG to the color type you want. Default: yes*/ - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - unsigned read_text_chunks; /*if false but remember_unknown_chunks is true, they're stored in the unknown chunks*/ - - /*store all bytes from unknown chunks in the LodePNGInfo (off by default, useful for a png editor)*/ - unsigned remember_unknown_chunks; - - /* maximum size for decompressed text chunks. If a text chunk's text is larger than this, an error is returned, - unless reading text chunks is disabled or this limit is set higher or disabled. Set to 0 to allow any size. - By default it is a value that prevents unreasonably large strings from hogging memory. */ - size_t max_text_size; - - /* maximum size for compressed ICC chunks. If the ICC profile is larger than this, an error will be returned. Set to - 0 to allow any size. By default this is a value that prevents ICC profiles that would be much larger than any - legitimate profile could be to hog memory. */ - size_t max_icc_size; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} LodePNGDecoderSettings; - -void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings); -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -/*automatically use color type with less bits per pixel if losslessly possible. Default: AUTO*/ -typedef enum LodePNGFilterStrategy { - /*every filter at zero*/ - LFS_ZERO = 0, - /*every filter at 1, 2, 3 or 4 (paeth), unlike LFS_ZERO not a good choice, but for testing*/ - LFS_ONE = 1, - LFS_TWO = 2, - LFS_THREE = 3, - LFS_FOUR = 4, - /*Use filter that gives minimum sum, as described in the official PNG filter heuristic.*/ - LFS_MINSUM, - /*Use the filter type that gives smallest Shannon entropy for this scanline. Depending - on the image, this is better or worse than minsum.*/ - LFS_ENTROPY, - /* - Brute-force-search PNG filters by compressing each filter for each scanline. - Experimental, very slow, and only rarely gives better compression than MINSUM. - */ - LFS_BRUTE_FORCE, - /*use predefined_filters buffer: you specify the filter type for each scanline*/ - LFS_PREDEFINED -} LodePNGFilterStrategy; - -/*Gives characteristics about the integer RGBA colors of the image (count, alpha channel usage, bit depth, ...), -which helps decide which color model to use for encoding. -Used internally by default if "auto_convert" is enabled. Public because it's useful for custom algorithms.*/ -typedef struct LodePNGColorStats { - unsigned colored; /*not grayscale*/ - unsigned key; /*image is not opaque and color key is possible instead of full alpha*/ - unsigned short key_r; /*key values, always as 16-bit, in 8-bit case the byte is duplicated, e.g. 65535 means 255*/ - unsigned short key_g; - unsigned short key_b; - unsigned alpha; /*image is not opaque and alpha channel or alpha palette required*/ - unsigned numcolors; /*amount of colors, up to 257. Not valid if bits == 16 or allow_palette is disabled.*/ - unsigned char palette[1024]; /*Remembers up to the first 256 RGBA colors, in no particular order, only valid when numcolors is valid*/ - unsigned bits; /*bits per channel (not for palette). 1,2 or 4 for grayscale only. 16 if 16-bit per channel required.*/ - size_t numpixels; - - /*user settings for computing/using the stats*/ - unsigned allow_palette; /*default 1. if 0, disallow choosing palette colortype in auto_choose_color, and don't count numcolors*/ - unsigned allow_greyscale; /*default 1. if 0, choose RGB or RGBA even if the image only has gray colors*/ -} LodePNGColorStats; - -void lodepng_color_stats_init(LodePNGColorStats* stats); - -/*Get a LodePNGColorStats of the image. The stats must already have been inited. -Returns error code (e.g. alloc fail) or 0 if ok.*/ -unsigned lodepng_compute_color_stats(LodePNGColorStats* stats, - const unsigned char* image, unsigned w, unsigned h, - const LodePNGColorMode* mode_in); - -/*Settings for the encoder.*/ -typedef struct LodePNGEncoderSettings { - LodePNGCompressSettings zlibsettings; /*settings for the zlib encoder, such as window size, ...*/ - - unsigned auto_convert; /*automatically choose output PNG color type. Default: true*/ - - /*If true, follows the official PNG heuristic: if the PNG uses a palette or lower than - 8 bit depth, set all filters to zero. Otherwise use the filter_strategy. Note that to - completely follow the official PNG heuristic, filter_palette_zero must be true and - filter_strategy must be LFS_MINSUM*/ - unsigned filter_palette_zero; - /*Which filter strategy to use when not using zeroes due to filter_palette_zero. - Set filter_palette_zero to 0 to ensure always using your chosen strategy. Default: LFS_MINSUM*/ - LodePNGFilterStrategy filter_strategy; - /*used if filter_strategy is LFS_PREDEFINED. In that case, this must point to a buffer with - the same length as the amount of scanlines in the image, and each value must <= 5. You - have to cleanup this buffer, LodePNG will never free it. Don't forget that filter_palette_zero - must be set to 0 to ensure this is also used on palette or low bitdepth images.*/ - const unsigned char* predefined_filters; - - /*force creating a PLTE chunk if colortype is 2 or 6 (= a suggested palette). - If colortype is 3, PLTE is _always_ created.*/ - unsigned force_palette; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*add LodePNG identifier and version as a text chunk, for debugging*/ - unsigned add_id; - /*encode text chunks as zTXt chunks instead of tEXt chunks, and use compression in iTXt chunks*/ - unsigned text_compression; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} LodePNGEncoderSettings; - -void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings); -#endif /*LODEPNG_COMPILE_ENCODER*/ - - -#if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) -/*The settings, state and information for extended encoding and decoding.*/ -typedef struct LodePNGState { -#ifdef LODEPNG_COMPILE_DECODER - LodePNGDecoderSettings decoder; /*the decoding settings*/ -#endif /*LODEPNG_COMPILE_DECODER*/ -#ifdef LODEPNG_COMPILE_ENCODER - LodePNGEncoderSettings encoder; /*the encoding settings*/ -#endif /*LODEPNG_COMPILE_ENCODER*/ - LodePNGColorMode info_raw; /*specifies the format in which you would like to get the raw pixel buffer*/ - LodePNGInfo info_png; /*info of the PNG image obtained after decoding*/ - unsigned error; -} LodePNGState; - -/*init, cleanup and copy functions to use with this struct*/ -void lodepng_state_init(LodePNGState* state); -void lodepng_state_cleanup(LodePNGState* state); -void lodepng_state_copy(LodePNGState* dest, const LodePNGState* source); -#endif /* defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) */ - -#ifdef LODEPNG_COMPILE_DECODER -/* -Same as lodepng_decode_memory, but uses a LodePNGState to allow custom settings and -getting much more information about the PNG image and color mode. -*/ -unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h, - LodePNGState* state, - const unsigned char* in, size_t insize); - -/* -Read the PNG header, but not the actual data. This returns only the information -that is in the IHDR chunk of the PNG, such as width, height and color type. The -information is placed in the info_png field of the LodePNGState. -*/ -unsigned lodepng_inspect(unsigned* w, unsigned* h, - LodePNGState* state, - const unsigned char* in, size_t insize); -#endif /*LODEPNG_COMPILE_DECODER*/ - -/* -Reads one metadata chunk (other than IHDR) of the PNG file and outputs what it -read in the state. Returns error code on failure. -Use lodepng_inspect first with a new state, then e.g. lodepng_chunk_find_const -to find the desired chunk type, and if non null use lodepng_inspect_chunk (with -chunk_pointer - start_of_file as pos). -Supports most metadata chunks from the PNG standard (gAMA, bKGD, tEXt, ...). -Ignores unsupported, unknown, non-metadata or IHDR chunks (without error). -Requirements: &in[pos] must point to start of a chunk, must use regular -lodepng_inspect first since format of most other chunks depends on IHDR, and if -there is a PLTE chunk, that one must be inspected before tRNS or bKGD. -*/ -unsigned lodepng_inspect_chunk(LodePNGState* state, size_t pos, - const unsigned char* in, size_t insize); - -#ifdef LODEPNG_COMPILE_ENCODER -/*This function allocates the out buffer with standard malloc and stores the size in *outsize.*/ -unsigned lodepng_encode(unsigned char** out, size_t* outsize, - const unsigned char* image, unsigned w, unsigned h, - LodePNGState* state); -#endif /*LODEPNG_COMPILE_ENCODER*/ - -/* -The lodepng_chunk functions are normally not needed, except to traverse the -unknown chunks stored in the LodePNGInfo struct, or add new ones to it. -It also allows traversing the chunks of an encoded PNG file yourself. - -The chunk pointer always points to the beginning of the chunk itself, that is -the first byte of the 4 length bytes. - -In the PNG file format, chunks have the following format: --4 bytes length: length of the data of the chunk in bytes (chunk itself is 12 bytes longer) --4 bytes chunk type (ASCII a-z,A-Z only, see below) --length bytes of data (may be 0 bytes if length was 0) --4 bytes of CRC, computed on chunk name + data - -The first chunk starts at the 8th byte of the PNG file, the entire rest of the file -exists out of concatenated chunks with the above format. - -PNG standard chunk ASCII naming conventions: --First byte: uppercase = critical, lowercase = ancillary --Second byte: uppercase = public, lowercase = private --Third byte: must be uppercase --Fourth byte: uppercase = unsafe to copy, lowercase = safe to copy -*/ - -/* -Gets the length of the data of the chunk. Total chunk length has 12 bytes more. -There must be at least 4 bytes to read from. If the result value is too large, -it may be corrupt data. -*/ -unsigned lodepng_chunk_length(const unsigned char* chunk); - -/*puts the 4-byte type in null terminated string*/ -void lodepng_chunk_type(char type[5], const unsigned char* chunk); - -/*check if the type is the given type*/ -unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type); - -/*0: it's one of the critical chunk types, 1: it's an ancillary chunk (see PNG standard)*/ -unsigned char lodepng_chunk_ancillary(const unsigned char* chunk); - -/*0: public, 1: private (see PNG standard)*/ -unsigned char lodepng_chunk_private(const unsigned char* chunk); - -/*0: the chunk is unsafe to copy, 1: the chunk is safe to copy (see PNG standard)*/ -unsigned char lodepng_chunk_safetocopy(const unsigned char* chunk); - -/*get pointer to the data of the chunk, where the input points to the header of the chunk*/ -unsigned char* lodepng_chunk_data(unsigned char* chunk); -const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk); - -/*returns 0 if the crc is correct, 1 if it's incorrect (0 for OK as usual!)*/ -unsigned lodepng_chunk_check_crc(const unsigned char* chunk); - -/*generates the correct CRC from the data and puts it in the last 4 bytes of the chunk*/ -void lodepng_chunk_generate_crc(unsigned char* chunk); - -/* -Iterate to next chunks, allows iterating through all chunks of the PNG file. -Input must be at the beginning of a chunk (result of a previous lodepng_chunk_next call, -or the 8th byte of a PNG file which always has the first chunk), or alternatively may -point to the first byte of the PNG file (which is not a chunk but the magic header, the -function will then skip over it and return the first real chunk). -Will output pointer to the start of the next chunk, or at or beyond end of the file if there -is no more chunk after this or possibly if the chunk is corrupt. -Start this process at the 8th byte of the PNG file. -In a non-corrupt PNG file, the last chunk should have name "IEND". -*/ -unsigned char* lodepng_chunk_next(unsigned char* chunk, unsigned char* end); -const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk, const unsigned char* end); - -/*Finds the first chunk with the given type in the range [chunk, end), or returns NULL if not found.*/ -unsigned char* lodepng_chunk_find(unsigned char* chunk, unsigned char* end, const char type[5]); -const unsigned char* lodepng_chunk_find_const(const unsigned char* chunk, const unsigned char* end, const char type[5]); - -/* -Appends chunk to the data in out. The given chunk should already have its chunk header. -The out variable and outsize are updated to reflect the new reallocated buffer. -Returns error code (0 if it went ok) -*/ -unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk); - -/* -Appends new chunk to out. The chunk to append is given by giving its length, type -and data separately. The type is a 4-letter string. -The out variable and outsize are updated to reflect the new reallocated buffer. -Returne error code (0 if it went ok) -*/ -unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize, unsigned length, - const char* type, const unsigned char* data); - - -/*Calculate CRC32 of buffer*/ -unsigned lodepng_crc32(const unsigned char* buf, size_t len); -#endif /*LODEPNG_COMPILE_PNG*/ - - -#ifdef LODEPNG_COMPILE_ZLIB -/* -This zlib part can be used independently to zlib compress and decompress a -buffer. It cannot be used to create gzip files however, and it only supports the -part of zlib that is required for PNG, it does not support dictionaries. -*/ - -#ifdef LODEPNG_COMPILE_DECODER -/*Inflate a buffer. Inflate is the decompression step of deflate. Out buffer must be freed after use.*/ -unsigned lodepng_inflate(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings); - -/* -Decompresses Zlib data. Reallocates the out buffer and appends the data. The -data must be according to the zlib specification. -Either, *out must be NULL and *outsize must be 0, or, *out must be a valid -buffer and *outsize its size in bytes. out must be freed by user after usage. -*/ -unsigned lodepng_zlib_decompress(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings); -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -/* -Compresses data with Zlib. Reallocates the out buffer and appends the data. -Zlib adds a small header and trailer around the deflate data. -The data is output in the format of the zlib specification. -Either, *out must be NULL and *outsize must be 0, or, *out must be a valid -buffer and *outsize its size in bytes. out must be freed by user after usage. -*/ -unsigned lodepng_zlib_compress(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGCompressSettings* settings); - -/* -Find length-limited Huffman code for given frequencies. This function is in the -public interface only for tests, it's used internally by lodepng_deflate. -*/ -unsigned lodepng_huffman_code_lengths(unsigned* lengths, const unsigned* frequencies, - size_t numcodes, unsigned maxbitlen); - -/*Compress a buffer with deflate. See RFC 1951. Out buffer must be freed after use.*/ -unsigned lodepng_deflate(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGCompressSettings* settings); - -#endif /*LODEPNG_COMPILE_ENCODER*/ -#endif /*LODEPNG_COMPILE_ZLIB*/ - -#ifdef LODEPNG_COMPILE_DISK -/* -Load a file from disk into buffer. The function allocates the out buffer, and -after usage you should free it. -out: output parameter, contains pointer to loaded buffer. -outsize: output parameter, size of the allocated out buffer -filename: the path to the file to load -return value: error code (0 means ok) - -NOTE: Wide-character filenames are not supported, you can use an external method -to handle such files and decode in-memory. -*/ -unsigned lodepng_load_file(unsigned char** out, size_t* outsize, const char* filename); - -/* -Save a file from buffer to disk. Warning, if it exists, this function overwrites -the file without warning! -buffer: the buffer to write -buffersize: size of the buffer to write -filename: the path to the file to save to -return value: error code (0 means ok) - -NOTE: Wide-character filenames are not supported, you can use an external method -to handle such files and encode in-memory -*/ -unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const char* filename); -#endif /*LODEPNG_COMPILE_DISK*/ - -#ifdef LODEPNG_COMPILE_CPP -/* The LodePNG C++ wrapper uses std::vectors instead of manually allocated memory buffers. */ -namespace lodepng { -#ifdef LODEPNG_COMPILE_PNG -class State : public LodePNGState { - public: - State(); - State(const State& other); - ~State(); - State& operator=(const State& other); -}; - -#ifdef LODEPNG_COMPILE_DECODER -/* Same as other lodepng::decode, but using a State for more settings and information. */ -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - State& state, - const unsigned char* in, size_t insize); -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - State& state, - const std::vector& in); -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -/* Same as other lodepng::encode, but using a State for more settings and information. */ -unsigned encode(std::vector& out, - const unsigned char* in, unsigned w, unsigned h, - State& state); -unsigned encode(std::vector& out, - const std::vector& in, unsigned w, unsigned h, - State& state); -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#ifdef LODEPNG_COMPILE_DISK -/* -Load a file from disk into an std::vector. -return value: error code (0 means ok) - -NOTE: Wide-character filenames are not supported, you can use an external method -to handle such files and decode in-memory -*/ -unsigned load_file(std::vector& buffer, const std::string& filename); - -/* -Save the binary data in an std::vector to a file on disk. The file is overwritten -without warning. - -NOTE: Wide-character filenames are not supported, you can use an external method -to handle such files and encode in-memory -*/ -unsigned save_file(const std::vector& buffer, const std::string& filename); -#endif /* LODEPNG_COMPILE_DISK */ -#endif /* LODEPNG_COMPILE_PNG */ - -#ifdef LODEPNG_COMPILE_ZLIB -#ifdef LODEPNG_COMPILE_DECODER -/* Zlib-decompress an unsigned char buffer */ -unsigned decompress(std::vector& out, const unsigned char* in, size_t insize, - const LodePNGDecompressSettings& settings = lodepng_default_decompress_settings); - -/* Zlib-decompress an std::vector */ -unsigned decompress(std::vector& out, const std::vector& in, - const LodePNGDecompressSettings& settings = lodepng_default_decompress_settings); -#endif /* LODEPNG_COMPILE_DECODER */ - -#ifdef LODEPNG_COMPILE_ENCODER -/* Zlib-compress an unsigned char buffer */ -unsigned compress(std::vector& out, const unsigned char* in, size_t insize, - const LodePNGCompressSettings& settings = lodepng_default_compress_settings); - -/* Zlib-compress an std::vector */ -unsigned compress(std::vector& out, const std::vector& in, - const LodePNGCompressSettings& settings = lodepng_default_compress_settings); -#endif /* LODEPNG_COMPILE_ENCODER */ -#endif /* LODEPNG_COMPILE_ZLIB */ -} /* namespace lodepng */ -#endif /*LODEPNG_COMPILE_CPP*/ - -/* -TODO: -[.] test if there are no memory leaks or security exploits - done a lot but needs to be checked often -[.] check compatibility with various compilers - done but needs to be redone for every newer version -[X] converting color to 16-bit per channel types -[X] support color profile chunk types (but never let them touch RGB values by default) -[ ] support all public PNG chunk types (almost done except sBIT, sPLT and hIST) -[ ] make sure encoder generates no chunks with size > (2^31)-1 -[ ] partial decoding (stream processing) -[X] let the "isFullyOpaque" function check color keys and transparent palettes too -[X] better name for the variables "codes", "codesD", "codelengthcodes", "clcl" and "lldl" -[ ] allow treating some errors like warnings, when image is recoverable (e.g. 69, 57, 58) -[ ] make warnings like: oob palette, checksum fail, data after iend, wrong/unknown crit chunk, no null terminator in text, ... -[ ] error messages with line numbers (and version) -[ ] errors in state instead of as return code? -[ ] new errors/warnings like suspiciously big decompressed ztxt or iccp chunk -[ ] let the C++ wrapper catch exceptions coming from the standard library and return LodePNG error codes -[ ] allow user to provide custom color conversion functions, e.g. for premultiplied alpha, padding bits or not, ... -[ ] allow user to give data (void*) to custom allocator -[X] provide alternatives for C library functions not present on some platforms (memcpy, ...) -*/ - -#endif /*LODEPNG_H inclusion guard*/ - -/* -LodePNG Documentation ---------------------- - -0. table of contents --------------------- - - 1. about - 1.1. supported features - 1.2. features not supported - 2. C and C++ version - 3. security - 4. decoding - 5. encoding - 6. color conversions - 6.1. PNG color types - 6.2. color conversions - 6.3. padding bits - 6.4. A note about 16-bits per channel and endianness - 7. error values - 8. chunks and PNG editing - 9. compiler support - 10. examples - 10.1. decoder C++ example - 10.2. decoder C example - 11. state settings reference - 12. changes - 13. contact information - - -1. about --------- - -PNG is a file format to store raster images losslessly with good compression, -supporting different color types and alpha channel. - -LodePNG is a PNG codec according to the Portable Network Graphics (PNG) -Specification (Second Edition) - W3C Recommendation 10 November 2003. - -The specifications used are: - -*) Portable Network Graphics (PNG) Specification (Second Edition): - http://www.w3.org/TR/2003/REC-PNG-20031110 -*) RFC 1950 ZLIB Compressed Data Format version 3.3: - http://www.gzip.org/zlib/rfc-zlib.html -*) RFC 1951 DEFLATE Compressed Data Format Specification ver 1.3: - http://www.gzip.org/zlib/rfc-deflate.html - -The most recent version of LodePNG can currently be found at -http://lodev.org/lodepng/ - -LodePNG works both in C (ISO C90) and C++, with a C++ wrapper that adds -extra functionality. - -LodePNG exists out of two files: --lodepng.h: the header file for both C and C++ --lodepng.c(pp): give it the name lodepng.c or lodepng.cpp (or .cc) depending on your usage - -If you want to start using LodePNG right away without reading this doc, get the -examples from the LodePNG website to see how to use it in code, or check the -smaller examples in chapter 13 here. - -LodePNG is simple but only supports the basic requirements. To achieve -simplicity, the following design choices were made: There are no dependencies -on any external library. There are functions to decode and encode a PNG with -a single function call, and extended versions of these functions taking a -LodePNGState struct allowing to specify or get more information. By default -the colors of the raw image are always RGB or RGBA, no matter what color type -the PNG file uses. To read and write files, there are simple functions to -convert the files to/from buffers in memory. - -This all makes LodePNG suitable for loading textures in games, demos and small -programs, ... It's less suitable for full fledged image editors, loading PNGs -over network (it requires all the image data to be available before decoding can -begin), life-critical systems, ... - -1.1. supported features ------------------------ - -The following features are supported by the decoder: - -*) decoding of PNGs with any color type, bit depth and interlace mode, to a 24- or 32-bit color raw image, - or the same color type as the PNG -*) encoding of PNGs, from any raw image to 24- or 32-bit color, or the same color type as the raw image -*) Adam7 interlace and deinterlace for any color type -*) loading the image from harddisk or decoding it from a buffer from other sources than harddisk -*) support for alpha channels, including RGBA color model, translucent palettes and color keying -*) zlib decompression (inflate) -*) zlib compression (deflate) -*) CRC32 and ADLER32 checksums -*) colorimetric color profile conversions: currently experimentally available in lodepng_util.cpp only, - plus alternatively ability to pass on chroma/gamma/ICC profile information to other color management system. -*) handling of unknown chunks, allowing making a PNG editor that stores custom and unknown chunks. -*) the following chunks are supported by both encoder and decoder: - IHDR: header information - PLTE: color palette - IDAT: pixel data - IEND: the final chunk - tRNS: transparency for palettized images - tEXt: textual information - zTXt: compressed textual information - iTXt: international textual information - bKGD: suggested background color - pHYs: physical dimensions - tIME: modification time - cHRM: RGB chromaticities - gAMA: RGB gamma correction - iCCP: ICC color profile - sRGB: rendering intent - -1.2. features not supported ---------------------------- - -The following features are _not_ supported: - -*) some features needed to make a conformant PNG-Editor might be still missing. -*) partial loading/stream processing. All data must be available and is processed in one call. -*) The following public chunks are not (yet) supported but treated as unknown chunks by LodePNG: - sBIT - hIST - sPLT - - -2. C and C++ version --------------------- - -The C version uses buffers allocated with alloc that you need to free() -yourself. You need to use init and cleanup functions for each struct whenever -using a struct from the C version to avoid exploits and memory leaks. - -The C++ version has extra functions with std::vectors in the interface and the -lodepng::State class which is a LodePNGState with constructor and destructor. - -These files work without modification for both C and C++ compilers because all -the additional C++ code is in "#ifdef __cplusplus" blocks that make C-compilers -ignore it, and the C code is made to compile both with strict ISO C90 and C++. - -To use the C++ version, you need to rename the source file to lodepng.cpp -(instead of lodepng.c), and compile it with a C++ compiler. - -To use the C version, you need to rename the source file to lodepng.c (instead -of lodepng.cpp), and compile it with a C compiler. - - -3. Security ------------ - -Even if carefully designed, it's always possible that LodePNG contains possible -exploits. If you discover one, please let me know, and it will be fixed. - -When using LodePNG, care has to be taken with the C version of LodePNG, as well -as the C-style structs when working with C++. The following conventions are used -for all C-style structs: - --if a struct has a corresponding init function, always call the init function when making a new one --if a struct has a corresponding cleanup function, call it before the struct disappears to avoid memory leaks --if a struct has a corresponding copy function, use the copy function instead of "=". - The destination must also be inited already. - - -4. Decoding ------------ - -Decoding converts a PNG compressed image to a raw pixel buffer. - -Most documentation on using the decoder is at its declarations in the header -above. For C, simple decoding can be done with functions such as -lodepng_decode32, and more advanced decoding can be done with the struct -LodePNGState and lodepng_decode. For C++, all decoding can be done with the -various lodepng::decode functions, and lodepng::State can be used for advanced -features. - -When using the LodePNGState, it uses the following fields for decoding: -*) LodePNGInfo info_png: it stores extra information about the PNG (the input) in here -*) LodePNGColorMode info_raw: here you can say what color mode of the raw image (the output) you want to get -*) LodePNGDecoderSettings decoder: you can specify a few extra settings for the decoder to use - -LodePNGInfo info_png --------------------- - -After decoding, this contains extra information of the PNG image, except the actual -pixels, width and height because these are already gotten directly from the decoder -functions. - -It contains for example the original color type of the PNG image, text comments, -suggested background color, etc... More details about the LodePNGInfo struct are -at its declaration documentation. - -LodePNGColorMode info_raw -------------------------- - -When decoding, here you can specify which color type you want -the resulting raw image to be. If this is different from the colortype of the -PNG, then the decoder will automatically convert the result. This conversion -always works, except if you want it to convert a color PNG to grayscale or to -a palette with missing colors. - -By default, 32-bit color is used for the result. - -LodePNGDecoderSettings decoder ------------------------------- - -The settings can be used to ignore the errors created by invalid CRC and Adler32 -chunks, and to disable the decoding of tEXt chunks. - -There's also a setting color_convert, true by default. If false, no conversion -is done, the resulting data will be as it was in the PNG (after decompression) -and you'll have to puzzle the colors of the pixels together yourself using the -color type information in the LodePNGInfo. - - -5. Encoding ------------ - -Encoding converts a raw pixel buffer to a PNG compressed image. - -Most documentation on using the encoder is at its declarations in the header -above. For C, simple encoding can be done with functions such as -lodepng_encode32, and more advanced decoding can be done with the struct -LodePNGState and lodepng_encode. For C++, all encoding can be done with the -various lodepng::encode functions, and lodepng::State can be used for advanced -features. - -Like the decoder, the encoder can also give errors. However it gives less errors -since the encoder input is trusted, the decoder input (a PNG image that could -be forged by anyone) is not trusted. - -When using the LodePNGState, it uses the following fields for encoding: -*) LodePNGInfo info_png: here you specify how you want the PNG (the output) to be. -*) LodePNGColorMode info_raw: here you say what color type of the raw image (the input) has -*) LodePNGEncoderSettings encoder: you can specify a few settings for the encoder to use - -LodePNGInfo info_png --------------------- - -When encoding, you use this the opposite way as when decoding: for encoding, -you fill in the values you want the PNG to have before encoding. By default it's -not needed to specify a color type for the PNG since it's automatically chosen, -but it's possible to choose it yourself given the right settings. - -The encoder will not always exactly match the LodePNGInfo struct you give, -it tries as close as possible. Some things are ignored by the encoder. The -encoder uses, for example, the following settings from it when applicable: -colortype and bitdepth, text chunks, time chunk, the color key, the palette, the -background color, the interlace method, unknown chunks, ... - -When encoding to a PNG with colortype 3, the encoder will generate a PLTE chunk. -If the palette contains any colors for which the alpha channel is not 255 (so -there are translucent colors in the palette), it'll add a tRNS chunk. - -LodePNGColorMode info_raw -------------------------- - -You specify the color type of the raw image that you give to the input here, -including a possible transparent color key and palette you happen to be using in -your raw image data. - -By default, 32-bit color is assumed, meaning your input has to be in RGBA -format with 4 bytes (unsigned chars) per pixel. - -LodePNGEncoderSettings encoder ------------------------------- - -The following settings are supported (some are in sub-structs): -*) auto_convert: when this option is enabled, the encoder will -automatically choose the smallest possible color mode (including color key) that -can encode the colors of all pixels without information loss. -*) btype: the block type for LZ77. 0 = uncompressed, 1 = fixed huffman tree, - 2 = dynamic huffman tree (best compression). Should be 2 for proper - compression. -*) use_lz77: whether or not to use LZ77 for compressed block types. Should be - true for proper compression. -*) windowsize: the window size used by the LZ77 encoder (1 - 32768). Has value - 2048 by default, but can be set to 32768 for better, but slow, compression. -*) force_palette: if colortype is 2 or 6, you can make the encoder write a PLTE - chunk if force_palette is true. This can used as suggested palette to convert - to by viewers that don't support more than 256 colors (if those still exist) -*) add_id: add text chunk "Encoder: LodePNG " to the image. -*) text_compression: default 1. If 1, it'll store texts as zTXt instead of tEXt chunks. - zTXt chunks use zlib compression on the text. This gives a smaller result on - large texts but a larger result on small texts (such as a single program name). - It's all tEXt or all zTXt though, there's no separate setting per text yet. - - -6. color conversions --------------------- - -An important thing to note about LodePNG, is that the color type of the PNG, and -the color type of the raw image, are completely independent. By default, when -you decode a PNG, you get the result as a raw image in the color type you want, -no matter whether the PNG was encoded with a palette, grayscale or RGBA color. -And if you encode an image, by default LodePNG will automatically choose the PNG -color type that gives good compression based on the values of colors and amount -of colors in the image. It can be configured to let you control it instead as -well, though. - -To be able to do this, LodePNG does conversions from one color mode to another. -It can convert from almost any color type to any other color type, except the -following conversions: RGB to grayscale is not supported, and converting to a -palette when the palette doesn't have a required color is not supported. This is -not supported on purpose: this is information loss which requires a color -reduction algorithm that is beyond the scope of a PNG encoder (yes, RGB to gray -is easy, but there are multiple ways if you want to give some channels more -weight). - -By default, when decoding, you get the raw image in 32-bit RGBA or 24-bit RGB -color, no matter what color type the PNG has. And by default when encoding, -LodePNG automatically picks the best color model for the output PNG, and expects -the input image to be 32-bit RGBA or 24-bit RGB. So, unless you want to control -the color format of the images yourself, you can skip this chapter. - -6.1. PNG color types --------------------- - -A PNG image can have many color types, ranging from 1-bit color to 64-bit color, -as well as palettized color modes. After the zlib decompression and unfiltering -in the PNG image is done, the raw pixel data will have that color type and thus -a certain amount of bits per pixel. If you want the output raw image after -decoding to have another color type, a conversion is done by LodePNG. - -The PNG specification gives the following color types: - -0: grayscale, bit depths 1, 2, 4, 8, 16 -2: RGB, bit depths 8 and 16 -3: palette, bit depths 1, 2, 4 and 8 -4: grayscale with alpha, bit depths 8 and 16 -6: RGBA, bit depths 8 and 16 - -Bit depth is the amount of bits per pixel per color channel. So the total amount -of bits per pixel is: amount of channels * bitdepth. - -6.2. color conversions ----------------------- - -As explained in the sections about the encoder and decoder, you can specify -color types and bit depths in info_png and info_raw to change the default -behaviour. - -If, when decoding, you want the raw image to be something else than the default, -you need to set the color type and bit depth you want in the LodePNGColorMode, -or the parameters colortype and bitdepth of the simple decoding function. - -If, when encoding, you use another color type than the default in the raw input -image, you need to specify its color type and bit depth in the LodePNGColorMode -of the raw image, or use the parameters colortype and bitdepth of the simple -encoding function. - -If, when encoding, you don't want LodePNG to choose the output PNG color type -but control it yourself, you need to set auto_convert in the encoder settings -to false, and specify the color type you want in the LodePNGInfo of the -encoder (including palette: it can generate a palette if auto_convert is true, -otherwise not). - -If the input and output color type differ (whether user chosen or auto chosen), -LodePNG will do a color conversion, which follows the rules below, and may -sometimes result in an error. - -To avoid some confusion: --the decoder converts from PNG to raw image --the encoder converts from raw image to PNG --the colortype and bitdepth in LodePNGColorMode info_raw, are those of the raw image --the colortype and bitdepth in the color field of LodePNGInfo info_png, are those of the PNG --when encoding, the color type in LodePNGInfo is ignored if auto_convert - is enabled, it is automatically generated instead --when decoding, the color type in LodePNGInfo is set by the decoder to that of the original - PNG image, but it can be ignored since the raw image has the color type you requested instead --if the color type of the LodePNGColorMode and PNG image aren't the same, a conversion - between the color types is done if the color types are supported. If it is not - supported, an error is returned. If the types are the same, no conversion is done. --even though some conversions aren't supported, LodePNG supports loading PNGs from any - colortype and saving PNGs to any colortype, sometimes it just requires preparing - the raw image correctly before encoding. --both encoder and decoder use the same color converter. - -The function lodepng_convert does the color conversion. It is available in the -interface but normally isn't needed since the encoder and decoder already call -it. - -Non supported color conversions: --color to grayscale when non-gray pixels are present: no error is thrown, but -the result will look ugly because only the red channel is taken (it assumes all -three channels are the same in this case so ignores green and blue). The reason -no error is given is to allow converting from three-channel grayscale images to -one-channel even if there are numerical imprecisions. --anything to palette when the palette does not have an exact match for a from-color -in it: in this case an error is thrown - -Supported color conversions: --anything to 8-bit RGB, 8-bit RGBA, 16-bit RGB, 16-bit RGBA --any gray or gray+alpha, to gray or gray+alpha --anything to a palette, as long as the palette has the requested colors in it --removing alpha channel --higher to smaller bitdepth, and vice versa - -If you want no color conversion to be done (e.g. for speed or control): --In the encoder, you can make it save a PNG with any color type by giving the -raw color mode and LodePNGInfo the same color mode, and setting auto_convert to -false. --In the decoder, you can make it store the pixel data in the same color type -as the PNG has, by setting the color_convert setting to false. Settings in -info_raw are then ignored. - -6.3. padding bits ------------------ - -In the PNG file format, if a less than 8-bit per pixel color type is used and the scanlines -have a bit amount that isn't a multiple of 8, then padding bits are used so that each -scanline starts at a fresh byte. But that is NOT true for the LodePNG raw input and output. -The raw input image you give to the encoder, and the raw output image you get from the decoder -will NOT have these padding bits, e.g. in the case of a 1-bit image with a width -of 7 pixels, the first pixel of the second scanline will the 8th bit of the first byte, -not the first bit of a new byte. - -6.4. A note about 16-bits per channel and endianness ----------------------------------------------------- - -LodePNG uses unsigned char arrays for 16-bit per channel colors too, just like -for any other color format. The 16-bit values are stored in big endian (most -significant byte first) in these arrays. This is the opposite order of the -little endian used by x86 CPU's. - -LodePNG always uses big endian because the PNG file format does so internally. -Conversions to other formats than PNG uses internally are not supported by -LodePNG on purpose, there are myriads of formats, including endianness of 16-bit -colors, the order in which you store R, G, B and A, and so on. Supporting and -converting to/from all that is outside the scope of LodePNG. - -This may mean that, depending on your use case, you may want to convert the big -endian output of LodePNG to little endian with a for loop. This is certainly not -always needed, many applications and libraries support big endian 16-bit colors -anyway, but it means you cannot simply cast the unsigned char* buffer to an -unsigned short* buffer on x86 CPUs. - - -7. error values ---------------- - -All functions in LodePNG that return an error code, return 0 if everything went -OK, or a non-zero code if there was an error. - -The meaning of the LodePNG error values can be retrieved with the function -lodepng_error_text: given the numerical error code, it returns a description -of the error in English as a string. - -Check the implementation of lodepng_error_text to see the meaning of each code. - -It is not recommended to use the numerical values to programmatically make -different decisions based on error types as the numbers are not guaranteed to -stay backwards compatible. They are for human consumption only. Programmatically -only 0 or non-0 matter. - - -8. chunks and PNG editing -------------------------- - -If you want to add extra chunks to a PNG you encode, or use LodePNG for a PNG -editor that should follow the rules about handling of unknown chunks, or if your -program is able to read other types of chunks than the ones handled by LodePNG, -then that's possible with the chunk functions of LodePNG. - -A PNG chunk has the following layout: - -4 bytes length -4 bytes type name -length bytes data -4 bytes CRC - -8.1. iterating through chunks ------------------------------ - -If you have a buffer containing the PNG image data, then the first chunk (the -IHDR chunk) starts at byte number 8 of that buffer. The first 8 bytes are the -signature of the PNG and are not part of a chunk. But if you start at byte 8 -then you have a chunk, and can check the following things of it. - -NOTE: none of these functions check for memory buffer boundaries. To avoid -exploits, always make sure the buffer contains all the data of the chunks. -When using lodepng_chunk_next, make sure the returned value is within the -allocated memory. - -unsigned lodepng_chunk_length(const unsigned char* chunk): - -Get the length of the chunk's data. The total chunk length is this length + 12. - -void lodepng_chunk_type(char type[5], const unsigned char* chunk): -unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type): - -Get the type of the chunk or compare if it's a certain type - -unsigned char lodepng_chunk_critical(const unsigned char* chunk): -unsigned char lodepng_chunk_private(const unsigned char* chunk): -unsigned char lodepng_chunk_safetocopy(const unsigned char* chunk): - -Check if the chunk is critical in the PNG standard (only IHDR, PLTE, IDAT and IEND are). -Check if the chunk is private (public chunks are part of the standard, private ones not). -Check if the chunk is safe to copy. If it's not, then, when modifying data in a critical -chunk, unsafe to copy chunks of the old image may NOT be saved in the new one if your -program doesn't handle that type of unknown chunk. - -unsigned char* lodepng_chunk_data(unsigned char* chunk): -const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk): - -Get a pointer to the start of the data of the chunk. - -unsigned lodepng_chunk_check_crc(const unsigned char* chunk): -void lodepng_chunk_generate_crc(unsigned char* chunk): - -Check if the crc is correct or generate a correct one. - -unsigned char* lodepng_chunk_next(unsigned char* chunk): -const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk): - -Iterate to the next chunk. This works if you have a buffer with consecutive chunks. Note that these -functions do no boundary checking of the allocated data whatsoever, so make sure there is enough -data available in the buffer to be able to go to the next chunk. - -unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk): -unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize, unsigned length, - const char* type, const unsigned char* data): - -These functions are used to create new chunks that are appended to the data in *out that has -length *outsize. The append function appends an existing chunk to the new data. The create -function creates a new chunk with the given parameters and appends it. Type is the 4-letter -name of the chunk. - -8.2. chunks in info_png ------------------------ - -The LodePNGInfo struct contains fields with the unknown chunk in it. It has 3 -buffers (each with size) to contain 3 types of unknown chunks: -the ones that come before the PLTE chunk, the ones that come between the PLTE -and the IDAT chunks, and the ones that come after the IDAT chunks. -It's necessary to make the distinction between these 3 cases because the PNG -standard forces to keep the ordering of unknown chunks compared to the critical -chunks, but does not force any other ordering rules. - -info_png.unknown_chunks_data[0] is the chunks before PLTE -info_png.unknown_chunks_data[1] is the chunks after PLTE, before IDAT -info_png.unknown_chunks_data[2] is the chunks after IDAT - -The chunks in these 3 buffers can be iterated through and read by using the same -way described in the previous subchapter. - -When using the decoder to decode a PNG, you can make it store all unknown chunks -if you set the option settings.remember_unknown_chunks to 1. By default, this -option is off (0). - -The encoder will always encode unknown chunks that are stored in the info_png. -If you need it to add a particular chunk that isn't known by LodePNG, you can -use lodepng_chunk_append or lodepng_chunk_create to the chunk data in -info_png.unknown_chunks_data[x]. - -Chunks that are known by LodePNG should not be added in that way. E.g. to make -LodePNG add a bKGD chunk, set background_defined to true and add the correct -parameters there instead. - - -9. compiler support -------------------- - -No libraries other than the current standard C library are needed to compile -LodePNG. For the C++ version, only the standard C++ library is needed on top. -Add the files lodepng.c(pp) and lodepng.h to your project, include -lodepng.h where needed, and your program can read/write PNG files. - -It is compatible with C90 and up, and C++03 and up. - -If performance is important, use optimization when compiling! For both the -encoder and decoder, this makes a large difference. - -Make sure that LodePNG is compiled with the same compiler of the same version -and with the same settings as the rest of the program, or the interfaces with -std::vectors and std::strings in C++ can be incompatible. - -CHAR_BITS must be 8 or higher, because LodePNG uses unsigned chars for octets. - -*) gcc and g++ - -LodePNG is developed in gcc so this compiler is natively supported. It gives no -warnings with compiler options "-Wall -Wextra -pedantic -ansi", with gcc and g++ -version 4.7.1 on Linux, 32-bit and 64-bit. - -*) Clang - -Fully supported and warning-free. - -*) Mingw - -The Mingw compiler (a port of gcc for Windows) should be fully supported by -LodePNG. - -*) Visual Studio and Visual C++ Express Edition - -LodePNG should be warning-free with warning level W4. Two warnings were disabled -with pragmas though: warning 4244 about implicit conversions, and warning 4996 -where it wants to use a non-standard function fopen_s instead of the standard C -fopen. - -Visual Studio may want "stdafx.h" files to be included in each source file and -give an error "unexpected end of file while looking for precompiled header". -This is not standard C++ and will not be added to the stock LodePNG. You can -disable it for lodepng.cpp only by right clicking it, Properties, C/C++, -Precompiled Headers, and set it to Not Using Precompiled Headers there. - -NOTE: Modern versions of VS should be fully supported, but old versions, e.g. -VS6, are not guaranteed to work. - -*) Compilers on Macintosh - -LodePNG has been reported to work both with gcc and LLVM for Macintosh, both for -C and C++. - -*) Other Compilers - -If you encounter problems on any compilers, feel free to let me know and I may -try to fix it if the compiler is modern and standards compliant. - - -10. examples ------------- - -This decoder example shows the most basic usage of LodePNG. More complex -examples can be found on the LodePNG website. - -NOTE: these examples do not support wide-character filenames, you can use an -external method to handle such files and encode or decode in-memory - -10.1. decoder C++ example -------------------------- - -#include "lodepng.h" -#include - -int main(int argc, char *argv[]) { - const char* filename = argc > 1 ? argv[1] : "test.png"; - - //load and decode - std::vector image; - unsigned width, height; - unsigned error = lodepng::decode(image, width, height, filename); - - //if there's an error, display it - if(error) std::cout << "decoder error " << error << ": " << lodepng_error_text(error) << std::endl; - - //the pixels are now in the vector "image", 4 bytes per pixel, ordered RGBARGBA..., use it as texture, draw it, ... -} - -10.2. decoder C example ------------------------ - -#include "lodepng.h" - -int main(int argc, char *argv[]) { - unsigned error; - unsigned char* image; - size_t width, height; - const char* filename = argc > 1 ? argv[1] : "test.png"; - - error = lodepng_decode32_file(&image, &width, &height, filename); - - if(error) printf("decoder error %u: %s\n", error, lodepng_error_text(error)); - - / * use image here * / - - free(image); - return 0; -} - -11. state settings reference ----------------------------- - -A quick reference of some settings to set on the LodePNGState - -For decoding: - -state.decoder.zlibsettings.ignore_adler32: ignore ADLER32 checksums -state.decoder.zlibsettings.custom_...: use custom inflate function -state.decoder.ignore_crc: ignore CRC checksums -state.decoder.ignore_critical: ignore unknown critical chunks -state.decoder.ignore_end: ignore missing IEND chunk. May fail if this corruption causes other errors -state.decoder.color_convert: convert internal PNG color to chosen one -state.decoder.read_text_chunks: whether to read in text metadata chunks -state.decoder.remember_unknown_chunks: whether to read in unknown chunks -state.info_raw.colortype: desired color type for decoded image -state.info_raw.bitdepth: desired bit depth for decoded image -state.info_raw....: more color settings, see struct LodePNGColorMode -state.info_png....: no settings for decoder but ouput, see struct LodePNGInfo - -For encoding: - -state.encoder.zlibsettings.btype: disable compression by setting it to 0 -state.encoder.zlibsettings.use_lz77: use LZ77 in compression -state.encoder.zlibsettings.windowsize: tweak LZ77 windowsize -state.encoder.zlibsettings.minmatch: tweak min LZ77 length to match -state.encoder.zlibsettings.nicematch: tweak LZ77 match where to stop searching -state.encoder.zlibsettings.lazymatching: try one more LZ77 matching -state.encoder.zlibsettings.custom_...: use custom deflate function -state.encoder.auto_convert: choose optimal PNG color type, if 0 uses info_png -state.encoder.filter_palette_zero: PNG filter strategy for palette -state.encoder.filter_strategy: PNG filter strategy to encode with -state.encoder.force_palette: add palette even if not encoding to one -state.encoder.add_id: add LodePNG identifier and version as a text chunk -state.encoder.text_compression: use compressed text chunks for metadata -state.info_raw.colortype: color type of raw input image you provide -state.info_raw.bitdepth: bit depth of raw input image you provide -state.info_raw: more color settings, see struct LodePNGColorMode -state.info_png.color.colortype: desired color type if auto_convert is false -state.info_png.color.bitdepth: desired bit depth if auto_convert is false -state.info_png.color....: more color settings, see struct LodePNGColorMode -state.info_png....: more PNG related settings, see struct LodePNGInfo - - -12. changes ------------ - -The version number of LodePNG is the date of the change given in the format -yyyymmdd. - -Some changes aren't backwards compatible. Those are indicated with a (!) -symbol. - -Not all changes are listed here, the commit history in github lists more: -https://github.com/lvandeve/lodepng - -*) 27 jun 2021: added warnings that file reading/writing functions don't support - wide-character filenames (support for this is not planned, opening files is - not the core part of PNG decoding/decoding and is platform dependent). -*) 17 okt 2020: prevent decoding too large text/icc chunks by default. -*) 06 mar 2020: simplified some of the dynamic memory allocations. -*) 12 jan 2020: (!) added 'end' argument to lodepng_chunk_next to allow correct - overflow checks. -*) 14 aug 2019: around 25% faster decoding thanks to huffman lookup tables. -*) 15 jun 2019: (!) auto_choose_color API changed (for bugfix: don't use palette - if gray ICC profile) and non-ICC LodePNGColorProfile renamed to - LodePNGColorStats. -*) 30 dec 2018: code style changes only: removed newlines before opening braces. -*) 10 sep 2018: added way to inspect metadata chunks without full decoding. -*) 19 aug 2018: (!) fixed color mode bKGD is encoded with and made it use - palette index in case of palette. -*) 10 aug 2018: (!) added support for gAMA, cHRM, sRGB and iCCP chunks. This - change is backwards compatible unless you relied on unknown_chunks for those. -*) 11 jun 2018: less restrictive check for pixel size integer overflow -*) 14 jan 2018: allow optionally ignoring a few more recoverable errors -*) 17 sep 2017: fix memory leak for some encoder input error cases -*) 27 nov 2016: grey+alpha auto color model detection bugfix -*) 18 apr 2016: Changed qsort to custom stable sort (for platforms w/o qsort). -*) 09 apr 2016: Fixed colorkey usage detection, and better file loading (within - the limits of pure C90). -*) 08 dec 2015: Made load_file function return error if file can't be opened. -*) 24 okt 2015: Bugfix with decoding to palette output. -*) 18 apr 2015: Boundary PM instead of just package-merge for faster encoding. -*) 24 aug 2014: Moved to github -*) 23 aug 2014: Reduced needless memory usage of decoder. -*) 28 jun 2014: Removed fix_png setting, always support palette OOB for - simplicity. Made ColorProfile public. -*) 09 jun 2014: Faster encoder by fixing hash bug and more zeros optimization. -*) 22 dec 2013: Power of two windowsize required for optimization. -*) 15 apr 2013: Fixed bug with LAC_ALPHA and color key. -*) 25 mar 2013: Added an optional feature to ignore some PNG errors (fix_png). -*) 11 mar 2013: (!) Bugfix with custom free. Changed from "my" to "lodepng_" - prefix for the custom allocators and made it possible with a new #define to - use custom ones in your project without needing to change lodepng's code. -*) 28 jan 2013: Bugfix with color key. -*) 27 okt 2012: Tweaks in text chunk keyword length error handling. -*) 8 okt 2012: (!) Added new filter strategy (entropy) and new auto color mode. - (no palette). Better deflate tree encoding. New compression tweak settings. - Faster color conversions while decoding. Some internal cleanups. -*) 23 sep 2012: Reduced warnings in Visual Studio a little bit. -*) 1 sep 2012: (!) Removed #define's for giving custom (de)compression functions - and made it work with function pointers instead. -*) 23 jun 2012: Added more filter strategies. Made it easier to use custom alloc - and free functions and toggle #defines from compiler flags. Small fixes. -*) 6 may 2012: (!) Made plugging in custom zlib/deflate functions more flexible. -*) 22 apr 2012: (!) Made interface more consistent, renaming a lot. Removed - redundant C++ codec classes. Reduced amount of structs. Everything changed, - but it is cleaner now imho and functionality remains the same. Also fixed - several bugs and shrunk the implementation code. Made new samples. -*) 6 nov 2011: (!) By default, the encoder now automatically chooses the best - PNG color model and bit depth, based on the amount and type of colors of the - raw image. For this, autoLeaveOutAlphaChannel replaced by auto_choose_color. -*) 9 okt 2011: simpler hash chain implementation for the encoder. -*) 8 sep 2011: lz77 encoder lazy matching instead of greedy matching. -*) 23 aug 2011: tweaked the zlib compression parameters after benchmarking. - A bug with the PNG filtertype heuristic was fixed, so that it chooses much - better ones (it's quite significant). A setting to do an experimental, slow, - brute force search for PNG filter types is added. -*) 17 aug 2011: (!) changed some C zlib related function names. -*) 16 aug 2011: made the code less wide (max 120 characters per line). -*) 17 apr 2011: code cleanup. Bugfixes. Convert low to 16-bit per sample colors. -*) 21 feb 2011: fixed compiling for C90. Fixed compiling with sections disabled. -*) 11 dec 2010: encoding is made faster, based on suggestion by Peter Eastman - to optimize long sequences of zeros. -*) 13 nov 2010: added LodePNG_InfoColor_hasPaletteAlpha and - LodePNG_InfoColor_canHaveAlpha functions for convenience. -*) 7 nov 2010: added LodePNG_error_text function to get error code description. -*) 30 okt 2010: made decoding slightly faster -*) 26 okt 2010: (!) changed some C function and struct names (more consistent). - Reorganized the documentation and the declaration order in the header. -*) 08 aug 2010: only changed some comments and external samples. -*) 05 jul 2010: fixed bug thanks to warnings in the new gcc version. -*) 14 mar 2010: fixed bug where too much memory was allocated for char buffers. -*) 02 sep 2008: fixed bug where it could create empty tree that linux apps could - read by ignoring the problem but windows apps couldn't. -*) 06 jun 2008: added more error checks for out of memory cases. -*) 26 apr 2008: added a few more checks here and there to ensure more safety. -*) 06 mar 2008: crash with encoding of strings fixed -*) 02 feb 2008: support for international text chunks added (iTXt) -*) 23 jan 2008: small cleanups, and #defines to divide code in sections -*) 20 jan 2008: support for unknown chunks allowing using LodePNG for an editor. -*) 18 jan 2008: support for tIME and pHYs chunks added to encoder and decoder. -*) 17 jan 2008: ability to encode and decode compressed zTXt chunks added - Also various fixes, such as in the deflate and the padding bits code. -*) 13 jan 2008: Added ability to encode Adam7-interlaced images. Improved - filtering code of encoder. -*) 07 jan 2008: (!) changed LodePNG to use ISO C90 instead of C++. A - C++ wrapper around this provides an interface almost identical to before. - Having LodePNG be pure ISO C90 makes it more portable. The C and C++ code - are together in these files but it works both for C and C++ compilers. -*) 29 dec 2007: (!) changed most integer types to unsigned int + other tweaks -*) 30 aug 2007: bug fixed which makes this Borland C++ compatible -*) 09 aug 2007: some VS2005 warnings removed again -*) 21 jul 2007: deflate code placed in new namespace separate from zlib code -*) 08 jun 2007: fixed bug with 2- and 4-bit color, and small interlaced images -*) 04 jun 2007: improved support for Visual Studio 2005: crash with accessing - invalid std::vector element [0] fixed, and level 3 and 4 warnings removed -*) 02 jun 2007: made the encoder add a tag with version by default -*) 27 may 2007: zlib and png code separated (but still in the same file), - simple encoder/decoder functions added for more simple usage cases -*) 19 may 2007: minor fixes, some code cleaning, new error added (error 69), - moved some examples from here to lodepng_examples.cpp -*) 12 may 2007: palette decoding bug fixed -*) 24 apr 2007: changed the license from BSD to the zlib license -*) 11 mar 2007: very simple addition: ability to encode bKGD chunks. -*) 04 mar 2007: (!) tEXt chunk related fixes, and support for encoding - palettized PNG images. Plus little interface change with palette and texts. -*) 03 mar 2007: Made it encode dynamic Huffman shorter with repeat codes. - Fixed a bug where the end code of a block had length 0 in the Huffman tree. -*) 26 feb 2007: Huffman compression with dynamic trees (BTYPE 2) now implemented - and supported by the encoder, resulting in smaller PNGs at the output. -*) 27 jan 2007: Made the Adler-32 test faster so that a timewaste is gone. -*) 24 jan 2007: gave encoder an error interface. Added color conversion from any - greyscale type to 8-bit greyscale with or without alpha. -*) 21 jan 2007: (!) Totally changed the interface. It allows more color types - to convert to and is more uniform. See the manual for how it works now. -*) 07 jan 2007: Some cleanup & fixes, and a few changes over the last days: - encode/decode custom tEXt chunks, separate classes for zlib & deflate, and - at last made the decoder give errors for incorrect Adler32 or Crc. -*) 01 jan 2007: Fixed bug with encoding PNGs with less than 8 bits per channel. -*) 29 dec 2006: Added support for encoding images without alpha channel, and - cleaned out code as well as making certain parts faster. -*) 28 dec 2006: Added "Settings" to the encoder. -*) 26 dec 2006: The encoder now does LZ77 encoding and produces much smaller files now. - Removed some code duplication in the decoder. Fixed little bug in an example. -*) 09 dec 2006: (!) Placed output parameters of public functions as first parameter. - Fixed a bug of the decoder with 16-bit per color. -*) 15 okt 2006: Changed documentation structure -*) 09 okt 2006: Encoder class added. It encodes a valid PNG image from the - given image buffer, however for now it's not compressed. -*) 08 sep 2006: (!) Changed to interface with a Decoder class -*) 30 jul 2006: (!) LodePNG_InfoPng , width and height are now retrieved in different - way. Renamed decodePNG to decodePNGGeneric. -*) 29 jul 2006: (!) Changed the interface: image info is now returned as a - struct of type LodePNG::LodePNG_Info, instead of a vector, which was a bit clumsy. -*) 28 jul 2006: Cleaned the code and added new error checks. - Corrected terminology "deflate" into "inflate". -*) 23 jun 2006: Added SDL example in the documentation in the header, this - example allows easy debugging by displaying the PNG and its transparency. -*) 22 jun 2006: (!) Changed way to obtain error value. Added - loadFile function for convenience. Made decodePNG32 faster. -*) 21 jun 2006: (!) Changed type of info vector to unsigned. - Changed position of palette in info vector. Fixed an important bug that - happened on PNGs with an uncompressed block. -*) 16 jun 2006: Internally changed unsigned into unsigned where - needed, and performed some optimizations. -*) 07 jun 2006: (!) Renamed functions to decodePNG and placed them - in LodePNG namespace. Changed the order of the parameters. Rewrote the - documentation in the header. Renamed files to lodepng.cpp and lodepng.h -*) 22 apr 2006: Optimized and improved some code -*) 07 sep 2005: (!) Changed to std::vector interface -*) 12 aug 2005: Initial release (C++, decoder only) - - -13. contact information ------------------------ - -Feel free to contact me with suggestions, problems, comments, ... concerning -LodePNG. If you encounter a PNG image that doesn't work properly with this -decoder, feel free to send it and I'll use it to find and fix the problem. - -My email address is (puzzle the account and domain together with an @ symbol): -Domain: gmail dot com. -Account: lode dot vandevenne. - - -Copyright (c) 2005-2021 Lode Vandevenne -*/ diff --git a/tools/make_patch.c b/tools/make_patch.c index 85ffb34bfa4..3a36accdd87 100644 --- a/tools/make_patch.c +++ b/tools/make_patch.c @@ -417,7 +417,7 @@ struct Buffer *process_template(const char *template_filename, const char *patch int compare_patch(const void *patch1, const void *patch2) { unsigned int offset1 = ((const struct Patch *)patch1)->offset; unsigned int offset2 = ((const struct Patch *)patch2)->offset; - return offset1 > offset2 ? 1 : offset1 < offset2 ? -1 : 0; + return (offset1 > offset2) - (offset1 < offset2); } bool verify_completeness(FILE *restrict orig_rom, FILE *restrict new_rom, struct Buffer *patches) { diff --git a/tools/palfix.py b/tools/palfix.py deleted file mode 100755 index a0b431da703..00000000000 --- a/tools/palfix.py +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -Usage: python palfix.py image.png - -Fix the palette format of the input image. Colored images (Pokémon or trainer -sprites) will become indexed, with a palette sorted {white, light color, dark -color, black}. Grayscale images will become two-bit grayscale. -""" - -import sys - -import png - -def rgb8_to_rgb5(c): - r, g, b = c - return (r // 8, g // 8, b // 8) - -def rgb5_to_rgb8(c): - r, g, b = c - return (r * 8 + r // 4, g * 8 + g // 4, b * 8 + b // 4) - -def invert(c): - r, g, b = c - return (31 - r, 31 - g, 31 - b) - -def luminance(c): - r, g, b = c - return 0.299 * r**2 + 0.587 * g**2 + 0.114 * b**2 - -def rgb5_pixels(row): - yield from (rgb8_to_rgb5(row[x:x+3]) for x in range(0, len(row), 4)) - -def is_grayscale(palette): - return (palette == ((31, 31, 31), (21, 21, 21), (10, 10, 10), (0, 0, 0)) or - palette == ((31, 31, 31), (20, 20, 20), (10, 10, 10), (0, 0, 0))) - -def fix_pal(filename): - with open(filename, 'rb') as file: - width, height, rows = png.Reader(file).asRGBA8()[:3] - rows = list(rows) - b_and_w = {(0, 0, 0), (31, 31, 31)} - colors = {c for row in rows for c in rgb5_pixels(row)} - b_and_w - if not colors: - colors = {(21, 21, 21), (10, 10, 10)} - elif len(colors) == 1: - c = colors.pop() - colors = {c, invert(c)} - elif len(colors) != 2: - return False - palette = tuple(sorted(colors | b_and_w, key=luminance, reverse=True)) - assert len(palette) == 4 - rows = [list(map(palette.index, rgb5_pixels(row))) for row in rows] - if is_grayscale(palette): - rows = [[3 - c for c in row] for row in rows] - writer = png.Writer(width, height, greyscale=True, bitdepth=2, compression=9) - else: - palette = tuple(map(rgb5_to_rgb8, palette)) - writer = png.Writer(width, height, palette=palette, bitdepth=8, compression=9) - with open(filename, 'wb') as file: - writer.write(file, rows) - return True - -def main(): - if len(sys.argv) < 2: - print(f'Usage: {sys.argv[0]} pic.png', file=sys.stderr) - sys.exit(1) - for filename in sys.argv[1:]: - if not filename.lower().endswith('.png'): - print(f'{filename} is not a .png file!', file=sys.stderr) - elif not fix_pal(filename): - print(f'{filename} has too many colors!', file=sys.stderr) - -if __name__ == '__main__': - main() diff --git a/tools/png.py b/tools/png.py deleted file mode 100755 index dd9746bf0ec..00000000000 --- a/tools/png.py +++ /dev/null @@ -1,2357 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# png.py - PNG encoder/decoder in pure Python -# -# Copyright (C) 2006 Johann C. Rocholl -# Portions Copyright (C) 2009 David Jones -# And probably portions Copyright (C) 2006 Nicko van Someren -# -# Original concept by Johann C. Rocholl. -# -# LICENCE (MIT) -# -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation files -# (the "Software"), to deal in the Software without restriction, -# including without limitation the rights to use, copy, modify, merge, -# publish, distribute, sublicense, and/or sell copies of the Software, -# and to permit persons to whom the Software is furnished to do so, -# subject to the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -""" -The ``png`` module can read and write PNG files. - -Installation and Overview -------------------------- - -``pip install pypng`` - -For help, type ``import png; help(png)`` in your python interpreter. - -A good place to start is the :class:`Reader` and :class:`Writer` classes. - -Coverage of PNG formats is fairly complete; -all allowable bit depths (1/2/4/8/16/24/32/48/64 bits per pixel) and -colour combinations are supported: - -- greyscale (1/2/4/8/16 bit); -- RGB, RGBA, LA (greyscale with alpha) with 8/16 bits per channel; -- colour mapped images (1/2/4/8 bit). - -Interlaced images, -which support a progressive display when downloading, -are supported for both reading and writing. - -A number of optional chunks can be specified (when writing) -and understood (when reading): ``tRNS``, ``bKGD``, ``gAMA``. - -The ``sBIT`` chunk can be used to specify precision for -non-native bit depths. - -Requires Python 3.5 or higher. -Installation is trivial, -but see the ``README.txt`` file (with the source distribution) for details. - -Full use of all features will need some reading of the PNG specification -http://www.w3.org/TR/2003/REC-PNG-20031110/. - -The package also comes with command line utilities. - -- ``pripamtopng`` converts - `Netpbm `_ PAM/PNM files to PNG; -- ``pripngtopam`` converts PNG to file PAM/PNM. - -There are a few more for simple PNG manipulations. - -Spelling and Terminology ------------------------- - -Generally British English spelling is used in the documentation. -So that's "greyscale" and "colour". -This not only matches the author's native language, -it's also used by the PNG specification. - -Colour Models -------------- - -The major colour models supported by PNG (and hence by PyPNG) are: - -- greyscale; -- greyscale--alpha; -- RGB; -- RGB--alpha. - -Also referred to using the abbreviations: L, LA, RGB, RGBA. -Each letter codes a single channel: -*L* is for Luminance or Luma or Lightness (greyscale images); -*A* stands for Alpha, the opacity channel -(used for transparency effects, but higher values are more opaque, -so it makes sense to call it opacity); -*R*, *G*, *B* stand for Red, Green, Blue (colour image). - -Lists, arrays, sequences, and so on ------------------------------------ - -When getting pixel data out of this module (reading) and -presenting data to this module (writing) there are -a number of ways the data could be represented as a Python value. - -The preferred format is a sequence of *rows*, -which each row being a sequence of *values*. -In this format, the values are in pixel order, -with all the values from all the pixels in a row -being concatenated into a single sequence for that row. - -Consider an image that is 3 pixels wide by 2 pixels high, and each pixel -has RGB components: - -Sequence of rows:: - - list([R,G,B, R,G,B, R,G,B], - [R,G,B, R,G,B, R,G,B]) - -Each row appears as its own list, -but the pixels are flattened so that three values for one pixel -simply follow the three values for the previous pixel. - -This is the preferred because -it provides a good compromise between space and convenience. -PyPNG regards itself as at liberty to replace any sequence type with -any sufficiently compatible other sequence type; -in practice each row is an array (``bytearray`` or ``array.array``). - -To allow streaming the outer list is sometimes -an iterator rather than an explicit list. - -An alternative format is a single array holding all the values. - -Array of values:: - - [R,G,B, R,G,B, R,G,B, - R,G,B, R,G,B, R,G,B] - -The entire image is one single giant sequence of colour values. -Generally an array will be used (to save space), not a list. - -The top row comes first, -and within each row the pixels are ordered from left-to-right. -Within a pixel the values appear in the order R-G-B-A -(or L-A for greyscale--alpha). - -There is another format, which should only be used with caution. -It is mentioned because it is used internally, -is close to what lies inside a PNG file itself, -and has some support from the public API. -This format is called *packed*. -When packed, each row is a sequence of bytes (integers from 0 to 255), -just as it is before PNG scanline filtering is applied. -When the bit depth is 8 this is the same as a sequence of rows; -when the bit depth is less than 8 (1, 2 and 4), -several pixels are packed into each byte; -when the bit depth is 16 each pixel value is decomposed into 2 bytes -(and `packed` is a misnomer). -This format is used by the :meth:`Writer.write_packed` method. -It isn't usually a convenient format, -but may be just right if the source data for -the PNG image comes from something that uses a similar format -(for example, 1-bit BMPs, or another PNG file). -""" - -__version__ = "0.0.21" - -import collections -import io # For io.BytesIO -import itertools -import math -# http://www.python.org/doc/2.4.4/lib/module-operator.html -import operator -import re -import struct -import sys -# http://www.python.org/doc/2.4.4/lib/module-warnings.html -import warnings -import zlib - -from array import array - - -__all__ = ['Image', 'Reader', 'Writer', 'write_chunks', 'from_array'] - - -# The PNG signature. -# http://www.w3.org/TR/PNG/#5PNG-file-signature -signature = struct.pack('8B', 137, 80, 78, 71, 13, 10, 26, 10) - -# The xstart, ystart, xstep, ystep for the Adam7 interlace passes. -adam7 = ((0, 0, 8, 8), - (4, 0, 8, 8), - (0, 4, 4, 8), - (2, 0, 4, 4), - (0, 2, 2, 4), - (1, 0, 2, 2), - (0, 1, 1, 2)) - - -def adam7_generate(width, height): - """ - Generate the coordinates for the reduced scanlines - of an Adam7 interlaced image - of size `width` by `height` pixels. - - Yields a generator for each pass, - and each pass generator yields a series of (x, y, xstep) triples, - each one identifying a reduced scanline consisting of - pixels starting at (x, y) and taking every xstep pixel to the right. - """ - - for xstart, ystart, xstep, ystep in adam7: - if xstart >= width: - continue - yield ((xstart, y, xstep) for y in range(ystart, height, ystep)) - - -# Models the 'pHYs' chunk (used by the Reader) -Resolution = collections.namedtuple('_Resolution', 'x y unit_is_meter') - - -def group(s, n): - return list(zip(* [iter(s)] * n)) - - -def isarray(x): - return isinstance(x, array) - - -def check_palette(palette): - """ - Check a palette argument (to the :class:`Writer` class) for validity. - Returns the palette as a list if okay; - raises an exception otherwise. - """ - - # None is the default and is allowed. - if palette is None: - return None - - p = list(palette) - if not (0 < len(p) <= 256): - raise ProtocolError( - "a palette must have between 1 and 256 entries," - " see https://www.w3.org/TR/PNG/#11PLTE") - seen_triple = False - for i, t in enumerate(p): - if len(t) not in (3, 4): - raise ProtocolError( - "palette entry %d: entries must be 3- or 4-tuples." % i) - if len(t) == 3: - seen_triple = True - if seen_triple and len(t) == 4: - raise ProtocolError( - "palette entry %d: all 4-tuples must precede all 3-tuples" % i) - for x in t: - if int(x) != x or not(0 <= x <= 255): - raise ProtocolError( - "palette entry %d: " - "values must be integer: 0 <= x <= 255" % i) - return p - - -def check_sizes(size, width, height): - """ - Check that these arguments, if supplied, are consistent. - Return a (width, height) pair. - """ - - if not size: - return width, height - - if len(size) != 2: - raise ProtocolError( - "size argument should be a pair (width, height)") - if width is not None and width != size[0]: - raise ProtocolError( - "size[0] (%r) and width (%r) should match when both are used." - % (size[0], width)) - if height is not None and height != size[1]: - raise ProtocolError( - "size[1] (%r) and height (%r) should match when both are used." - % (size[1], height)) - return size - - -def check_color(c, greyscale, which): - """ - Checks that a colour argument for transparent or background options - is the right form. - Returns the colour - (which, if it's a bare integer, is "corrected" to a 1-tuple). - """ - - if c is None: - return c - if greyscale: - try: - len(c) - except TypeError: - c = (c,) - if len(c) != 1: - raise ProtocolError("%s for greyscale must be 1-tuple" % which) - if not is_natural(c[0]): - raise ProtocolError( - "%s colour for greyscale must be integer" % which) - else: - if not (len(c) == 3 and - is_natural(c[0]) and - is_natural(c[1]) and - is_natural(c[2])): - raise ProtocolError( - "%s colour must be a triple of integers" % which) - return c - - -class Error(Exception): - def __str__(self): - return self.__class__.__name__ + ': ' + ' '.join(self.args) - - -class FormatError(Error): - """ - Problem with input file format. - In other words, PNG file does not conform to - the specification in some way and is invalid. - """ - - -class ProtocolError(Error): - """ - Problem with the way the programming interface has been used, - or the data presented to it. - """ - - -class ChunkError(FormatError): - pass - - -class Default: - """The default for the greyscale parameter.""" - - -class Writer: - """ - PNG encoder in pure Python. - """ - - def __init__(self, width=None, height=None, - size=None, - greyscale=Default, - alpha=False, - bitdepth=8, - palette=None, - transparent=None, - background=None, - gamma=None, - compression=None, - interlace=False, - planes=None, - colormap=None, - maxval=None, - chunk_limit=2**20, - x_pixels_per_unit=None, - y_pixels_per_unit=None, - unit_is_meter=False): - """ - Create a PNG encoder object. - - Arguments: - - width, height - Image size in pixels, as two separate arguments. - size - Image size (w,h) in pixels, as single argument. - greyscale - Pixels are greyscale, not RGB. - alpha - Input data has alpha channel (RGBA or LA). - bitdepth - Bit depth: from 1 to 16 (for each channel). - palette - Create a palette for a colour mapped image (colour type 3). - transparent - Specify a transparent colour (create a ``tRNS`` chunk). - background - Specify a default background colour (create a ``bKGD`` chunk). - gamma - Specify a gamma value (create a ``gAMA`` chunk). - compression - zlib compression level: 0 (none) to 9 (more compressed); - default: -1 or None. - interlace - Create an interlaced image. - chunk_limit - Write multiple ``IDAT`` chunks to save memory. - x_pixels_per_unit - Number of pixels a unit along the x axis (write a - `pHYs` chunk). - y_pixels_per_unit - Number of pixels a unit along the y axis (write a - `pHYs` chunk). Along with `x_pixel_unit`, this gives - the pixel size ratio. - unit_is_meter - `True` to indicate that the unit (for the `pHYs` - chunk) is metre. - - The image size (in pixels) can be specified either by using the - `width` and `height` arguments, or with the single `size` - argument. - If `size` is used it should be a pair (*width*, *height*). - - The `greyscale` argument indicates whether input pixels - are greyscale (when true), or colour (when false). - The default is true unless `palette=` is used. - - The `alpha` argument (a boolean) specifies - whether input pixels have an alpha channel (or not). - - `bitdepth` specifies the bit depth of the source pixel values. - Each channel may have a different bit depth. - Each source pixel must have values that are - an integer between 0 and ``2**bitdepth-1``, where - `bitdepth` is the bit depth for the corresponding channel. - For example, 8-bit images have values between 0 and 255. - PNG only stores images with bit depths of - 1,2,4,8, or 16 (the same for all channels). - When `bitdepth` is not one of these values or where - channels have different bit depths, - the next highest valid bit depth is selected, - and an ``sBIT`` (significant bits) chunk is generated - that specifies the original precision of the source image. - In this case the supplied pixel values will be rescaled to - fit the range of the selected bit depth. - - The PNG file format supports many bit depth / colour model - combinations, but not all. - The details are somewhat arcane - (refer to the PNG specification for full details). - Briefly: - Bit depths < 8 (1,2,4) are only allowed with greyscale and - colour mapped images; - colour mapped images cannot have bit depth 16. - - For colour mapped images - (in other words, when the `palette` argument is specified) - the `bitdepth` argument must match one of - the valid PNG bit depths: 1, 2, 4, or 8. - (It is valid to have a PNG image with a palette and - an ``sBIT`` chunk, but the meaning is slightly different; - it would be awkward to use the `bitdepth` argument for this.) - - The `palette` option, when specified, - causes a colour mapped image to be created: - the PNG colour type is set to 3; - `greyscale` must not be true; `alpha` must not be true; - `transparent` must not be set. - The bit depth must be 1,2,4, or 8. - When a colour mapped image is created, - the pixel values are palette indexes and - the `bitdepth` argument specifies the size of these indexes - (not the size of the colour values in the palette). - - The palette argument value should be a sequence of 3- or - 4-tuples. - 3-tuples specify RGB palette entries; - 4-tuples specify RGBA palette entries. - All the 4-tuples (if present) must come before all the 3-tuples. - A ``PLTE`` chunk is created; - if there are 4-tuples then a ``tRNS`` chunk is created as well. - The ``PLTE`` chunk will contain all the RGB triples in the same - sequence; - the ``tRNS`` chunk will contain the alpha channel for - all the 4-tuples, in the same sequence. - Palette entries are always 8-bit. - - If specified, the `transparent` and `background` parameters must be - a tuple with one element for each channel in the image. - Either a 3-tuple of integer (RGB) values for a colour image, or - a 1-tuple of a single integer for a greyscale image. - - If specified, the `gamma` parameter must be a positive number - (generally, a `float`). - A ``gAMA`` chunk will be created. - Note that this will not change the values of the pixels as - they appear in the PNG file, - they are assumed to have already - been converted appropriately for the gamma specified. - - The `compression` argument specifies the compression level to - be used by the ``zlib`` module. - Values from 1 to 9 (highest) specify compression. - 0 means no compression. - -1 and ``None`` both mean that the ``zlib`` module uses - the default level of compression (which is generally acceptable). - - If `interlace` is true then an interlaced image is created - (using PNG's so far only interlace method, *Adam7*). - This does not affect how the pixels should be passed in, - rather it changes how they are arranged into the PNG file. - On slow connexions interlaced images can be - partially decoded by the browser to give - a rough view of the image that is - successively refined as more image data appears. - - .. note :: - - Enabling the `interlace` option requires the entire image - to be processed in working memory. - - `chunk_limit` is used to limit the amount of memory used whilst - compressing the image. - In order to avoid using large amounts of memory, - multiple ``IDAT`` chunks may be created. - """ - - # At the moment the `planes` argument is ignored; - # its purpose is to act as a dummy so that - # ``Writer(x, y, **info)`` works, where `info` is a dictionary - # returned by Reader.read and friends. - # Ditto for `colormap`. - - width, height = check_sizes(size, width, height) - del size - - if not is_natural(width) or not is_natural(height): - raise ProtocolError("width and height must be integers") - if width <= 0 or height <= 0: - raise ProtocolError("width and height must be greater than zero") - # http://www.w3.org/TR/PNG/#7Integers-and-byte-order - if width > 2 ** 31 - 1 or height > 2 ** 31 - 1: - raise ProtocolError("width and height cannot exceed 2**31-1") - - if alpha and transparent is not None: - raise ProtocolError( - "transparent colour not allowed with alpha channel") - - # bitdepth is either single integer, or tuple of integers. - # Convert to tuple. - try: - len(bitdepth) - except TypeError: - bitdepth = (bitdepth, ) - for b in bitdepth: - valid = is_natural(b) and 1 <= b <= 16 - if not valid: - raise ProtocolError( - "each bitdepth %r must be a positive integer <= 16" % - (bitdepth,)) - - # Calculate channels, and - # expand bitdepth to be one element per channel. - palette = check_palette(palette) - alpha = bool(alpha) - colormap = bool(palette) - if greyscale is Default and palette: - greyscale = False - greyscale = bool(greyscale) - if colormap: - color_planes = 1 - planes = 1 - else: - color_planes = (3, 1)[greyscale] - planes = color_planes + alpha - if len(bitdepth) == 1: - bitdepth *= planes - - bitdepth, self.rescale = check_bitdepth_rescale( - palette, - bitdepth, - transparent, alpha, greyscale) - - # These are assertions, because above logic should have - # corrected or raised all problematic cases. - if bitdepth < 8: - assert greyscale or palette - assert not alpha - if bitdepth > 8: - assert not palette - - transparent = check_color(transparent, greyscale, 'transparent') - background = check_color(background, greyscale, 'background') - - # It's important that the true boolean values - # (greyscale, alpha, colormap, interlace) are converted - # to bool because Iverson's convention is relied upon later on. - self.width = width - self.height = height - self.transparent = transparent - self.background = background - self.gamma = gamma - self.greyscale = greyscale - self.alpha = alpha - self.colormap = colormap - self.bitdepth = int(bitdepth) - self.compression = compression - self.chunk_limit = chunk_limit - self.interlace = bool(interlace) - self.palette = palette - self.x_pixels_per_unit = x_pixels_per_unit - self.y_pixels_per_unit = y_pixels_per_unit - self.unit_is_meter = bool(unit_is_meter) - - self.color_type = (4 * self.alpha + - 2 * (not greyscale) + - 1 * self.colormap) - assert self.color_type in (0, 2, 3, 4, 6) - - self.color_planes = color_planes - self.planes = planes - # :todo: fix for bitdepth < 8 - self.psize = (self.bitdepth / 8) * self.planes - - def write(self, outfile, rows): - """ - Write a PNG image to the output file. - `rows` should be an iterable that yields each row - (each row is a sequence of values). - The rows should be the rows of the original image, - so there should be ``self.height`` rows of - ``self.width * self.planes`` values. - If `interlace` is specified (when creating the instance), - then an interlaced PNG file will be written. - Supply the rows in the normal image order; - the interlacing is carried out internally. - - .. note :: - - Interlacing requires the entire image to be in working memory. - """ - - # Values per row - vpr = self.width * self.planes - - def check_rows(rows): - """ - Yield each row in rows, - but check each row first (for correct width). - """ - for i, row in enumerate(rows): - try: - wrong_length = len(row) != vpr - except TypeError: - # When using an itertools.ichain object or - # other generator not supporting __len__, - # we set this to False to skip the check. - wrong_length = False - if wrong_length: - # Note: row numbers start at 0. - raise ProtocolError( - "Expected %d values but got %d values, in row %d" % - (vpr, len(row), i)) - yield row - - if self.interlace: - fmt = 'BH'[self.bitdepth > 8] - a = array(fmt, itertools.chain(*check_rows(rows))) - return self.write_array(outfile, a) - - nrows = self.write_passes(outfile, check_rows(rows)) - if nrows != self.height: - raise ProtocolError( - "rows supplied (%d) does not match height (%d)" % - (nrows, self.height)) - return nrows - - def write_passes(self, outfile, rows): - """ - Write a PNG image to the output file. - - Most users are expected to find the :meth:`write` or - :meth:`write_array` method more convenient. - - The rows should be given to this method in the order that - they appear in the output file. - For straightlaced images, this is the usual top to bottom ordering. - For interlaced images the rows should have been interlaced before - passing them to this function. - - `rows` should be an iterable that yields each row - (each row being a sequence of values). - """ - - # Ensure rows are scaled (to 4-/8-/16-bit), - # and packed into bytes. - - if self.rescale: - rows = rescale_rows(rows, self.rescale) - - if self.bitdepth < 8: - rows = pack_rows(rows, self.bitdepth) - elif self.bitdepth == 16: - rows = unpack_rows(rows) - - return self.write_packed(outfile, rows) - - def write_packed(self, outfile, rows): - """ - Write PNG file to `outfile`. - `rows` should be an iterator that yields each packed row; - a packed row being a sequence of packed bytes. - - The rows have a filter byte prefixed and - are then compressed into one or more IDAT chunks. - They are not processed any further, - so if bitdepth is other than 1, 2, 4, 8, 16, - the pixel values should have been scaled - before passing them to this method. - - This method does work for interlaced images but it is best avoided. - For interlaced images, the rows should be - presented in the order that they appear in the file. - """ - - self.write_preamble(outfile) - - # http://www.w3.org/TR/PNG/#11IDAT - if self.compression is not None: - compressor = zlib.compressobj(self.compression) - else: - compressor = zlib.compressobj() - - # data accumulates bytes to be compressed for the IDAT chunk; - # it's compressed when sufficiently large. - data = bytearray() - - # raise i scope out of the for loop. set to -1, because the for loop - # sets i to 0 on the first pass - i = -1 - for i, row in enumerate(rows): - # Add "None" filter type. - # Currently, it's essential that this filter type be used - # for every scanline as - # we do not mark the first row of a reduced pass image; - # that means we could accidentally compute - # the wrong filtered scanline if we used - # "up", "average", or "paeth" on such a line. - data.append(0) - data.extend(row) - if len(data) > self.chunk_limit: - compressed = compressor.compress(data) - if len(compressed): - write_chunk(outfile, b'IDAT', compressed) - data = bytearray() - - compressed = compressor.compress(bytes(data)) - flushed = compressor.flush() - if len(compressed) or len(flushed): - write_chunk(outfile, b'IDAT', compressed + flushed) - # http://www.w3.org/TR/PNG/#11IEND - write_chunk(outfile, b'IEND') - return i + 1 - - def write_preamble(self, outfile): - # http://www.w3.org/TR/PNG/#5PNG-file-signature - outfile.write(signature) - - # http://www.w3.org/TR/PNG/#11IHDR - write_chunk(outfile, b'IHDR', - struct.pack("!2I5B", self.width, self.height, - self.bitdepth, self.color_type, - 0, 0, self.interlace)) - - # See :chunk:order - # http://www.w3.org/TR/PNG/#11gAMA - if self.gamma is not None: - write_chunk(outfile, b'gAMA', - struct.pack("!L", int(round(self.gamma * 1e5)))) - - # See :chunk:order - # http://www.w3.org/TR/PNG/#11sBIT - if self.rescale: - write_chunk( - outfile, b'sBIT', - struct.pack('%dB' % self.planes, - * [s[0] for s in self.rescale])) - - # :chunk:order: Without a palette (PLTE chunk), - # ordering is relatively relaxed. - # With one, gAMA chunk must precede PLTE chunk - # which must precede tRNS and bKGD. - # See http://www.w3.org/TR/PNG/#5ChunkOrdering - if self.palette: - p, t = make_palette_chunks(self.palette) - write_chunk(outfile, b'PLTE', p) - if t: - # tRNS chunk is optional; - # Only needed if palette entries have alpha. - write_chunk(outfile, b'tRNS', t) - - # http://www.w3.org/TR/PNG/#11tRNS - if self.transparent is not None: - if self.greyscale: - fmt = "!1H" - else: - fmt = "!3H" - write_chunk(outfile, b'tRNS', - struct.pack(fmt, *self.transparent)) - - # http://www.w3.org/TR/PNG/#11bKGD - if self.background is not None: - if self.greyscale: - fmt = "!1H" - else: - fmt = "!3H" - write_chunk(outfile, b'bKGD', - struct.pack(fmt, *self.background)) - - # http://www.w3.org/TR/PNG/#11pHYs - if (self.x_pixels_per_unit is not None and - self.y_pixels_per_unit is not None): - tup = (self.x_pixels_per_unit, - self.y_pixels_per_unit, - int(self.unit_is_meter)) - write_chunk(outfile, b'pHYs', struct.pack("!LLB", *tup)) - - def write_array(self, outfile, pixels): - """ - Write an array that holds all the image values - as a PNG file on the output file. - See also :meth:`write` method. - """ - - if self.interlace: - if type(pixels) != array: - # Coerce to array type - fmt = 'BH'[self.bitdepth > 8] - pixels = array(fmt, pixels) - return self.write_passes( - outfile, - self.array_scanlines_interlace(pixels) - ) - else: - return self.write_passes( - outfile, - self.array_scanlines(pixels) - ) - - def array_scanlines(self, pixels): - """ - Generates rows (each a sequence of values) from - a single array of values. - """ - - # Values per row - vpr = self.width * self.planes - stop = 0 - for y in range(self.height): - start = stop - stop = start + vpr - yield pixels[start:stop] - - def array_scanlines_interlace(self, pixels): - """ - Generator for interlaced scanlines from an array. - `pixels` is the full source image as a single array of values. - The generator yields each scanline of the reduced passes in turn, - each scanline being a sequence of values. - """ - - # http://www.w3.org/TR/PNG/#8InterlaceMethods - # Array type. - fmt = 'BH'[self.bitdepth > 8] - # Value per row - vpr = self.width * self.planes - - # Each iteration generates a scanline starting at (x, y) - # and consisting of every xstep pixels. - for lines in adam7_generate(self.width, self.height): - for x, y, xstep in lines: - # Pixels per row (of reduced image) - ppr = int(math.ceil((self.width - x) / float(xstep))) - # Values per row (of reduced image) - reduced_row_len = ppr * self.planes - if xstep == 1: - # Easy case: line is a simple slice. - offset = y * vpr - yield pixels[offset: offset + vpr] - continue - # We have to step by xstep, - # which we can do one plane at a time - # using the step in Python slices. - row = array(fmt) - # There's no easier way to set the length of an array - row.extend(pixels[0:reduced_row_len]) - offset = y * vpr + x * self.planes - end_offset = (y + 1) * vpr - skip = self.planes * xstep - for i in range(self.planes): - row[i::self.planes] = \ - pixels[offset + i: end_offset: skip] - yield row - - -def write_chunk(outfile, tag, data=b''): - """ - Write a PNG chunk to the output file, including length and - checksum. - """ - - data = bytes(data) - # http://www.w3.org/TR/PNG/#5Chunk-layout - outfile.write(struct.pack("!I", len(data))) - outfile.write(tag) - outfile.write(data) - checksum = zlib.crc32(tag) - checksum = zlib.crc32(data, checksum) - checksum &= 2 ** 32 - 1 - outfile.write(struct.pack("!I", checksum)) - - -def write_chunks(out, chunks): - """Create a PNG file by writing out the chunks.""" - - out.write(signature) - for chunk in chunks: - write_chunk(out, *chunk) - - -def rescale_rows(rows, rescale): - """ - Take each row in rows (an iterator) and yield - a fresh row with the pixels scaled according to - the rescale parameters in the list `rescale`. - Each element of `rescale` is a tuple of - (source_bitdepth, target_bitdepth), - with one element per channel. - """ - - # One factor for each channel - fs = [float(2 ** s[1] - 1)/float(2 ** s[0] - 1) - for s in rescale] - - # Assume all target_bitdepths are the same - target_bitdepths = set(s[1] for s in rescale) - assert len(target_bitdepths) == 1 - (target_bitdepth, ) = target_bitdepths - typecode = 'BH'[target_bitdepth > 8] - - # Number of channels - n_chans = len(rescale) - - for row in rows: - rescaled_row = array(typecode, iter(row)) - for i in range(n_chans): - channel = array( - typecode, - (int(round(fs[i] * x)) for x in row[i::n_chans])) - rescaled_row[i::n_chans] = channel - yield rescaled_row - - -def pack_rows(rows, bitdepth): - """Yield packed rows that are a byte array. - Each byte is packed with the values from several pixels. - """ - - assert bitdepth < 8 - assert 8 % bitdepth == 0 - - # samples per byte - spb = int(8 / bitdepth) - - def make_byte(block): - """Take a block of (2, 4, or 8) values, - and pack them into a single byte. - """ - - res = 0 - for v in block: - res = (res << bitdepth) + v - return res - - for row in rows: - a = bytearray(row) - # Adding padding bytes so we can group into a whole - # number of spb-tuples. - n = float(len(a)) - extra = math.ceil(n / spb) * spb - n - a.extend([0] * int(extra)) - # Pack into bytes. - # Each block is the samples for one byte. - blocks = group(a, spb) - yield bytearray(make_byte(block) for block in blocks) - - -def unpack_rows(rows): - """Unpack each row from being 16-bits per value, - to being a sequence of bytes. - """ - for row in rows: - fmt = '!%dH' % len(row) - yield bytearray(struct.pack(fmt, *row)) - - -def make_palette_chunks(palette): - """ - Create the byte sequences for a ``PLTE`` and - if necessary a ``tRNS`` chunk. - Returned as a pair (*p*, *t*). - *t* will be ``None`` if no ``tRNS`` chunk is necessary. - """ - - p = bytearray() - t = bytearray() - - for x in palette: - p.extend(x[0:3]) - if len(x) > 3: - t.append(x[3]) - if t: - return p, t - return p, None - - -def check_bitdepth_rescale( - palette, bitdepth, transparent, alpha, greyscale): - """ - Returns (bitdepth, rescale) pair. - """ - - if palette: - if len(bitdepth) != 1: - raise ProtocolError( - "with palette, only a single bitdepth may be used") - (bitdepth, ) = bitdepth - if bitdepth not in (1, 2, 4, 8): - raise ProtocolError( - "with palette, bitdepth must be 1, 2, 4, or 8") - if transparent is not None: - raise ProtocolError("transparent and palette not compatible") - if alpha: - raise ProtocolError("alpha and palette not compatible") - if greyscale: - raise ProtocolError("greyscale and palette not compatible") - return bitdepth, None - - # No palette, check for sBIT chunk generation. - - if greyscale and not alpha: - # Single channel, L. - (bitdepth,) = bitdepth - if bitdepth in (1, 2, 4, 8, 16): - return bitdepth, None - if bitdepth > 8: - targetbitdepth = 16 - elif bitdepth == 3: - targetbitdepth = 4 - else: - assert bitdepth in (5, 6, 7) - targetbitdepth = 8 - return targetbitdepth, [(bitdepth, targetbitdepth)] - - assert alpha or not greyscale - - depth_set = tuple(set(bitdepth)) - if depth_set in [(8,), (16,)]: - # No sBIT required. - (bitdepth, ) = depth_set - return bitdepth, None - - targetbitdepth = (8, 16)[max(bitdepth) > 8] - return targetbitdepth, [(b, targetbitdepth) for b in bitdepth] - - -# Regex for decoding mode string -RegexModeDecode = re.compile("(LA?|RGBA?);?([0-9]*)", flags=re.IGNORECASE) - - -def from_array(a, mode=None, info={}): - """ - Create a PNG :class:`Image` object from a 2-dimensional array. - One application of this function is easy PIL-style saving: - ``png.from_array(pixels, 'L').save('foo.png')``. - - Unless they are specified using the *info* parameter, - the PNG's height and width are taken from the array size. - The first axis is the height; the second axis is the - ravelled width and channel index. - The array is treated is a sequence of rows, - each row being a sequence of values (``width*channels`` in number). - So an RGB image that is 16 pixels high and 8 wide will - occupy a 2-dimensional array that is 16x24 - (each row will be 8*3 = 24 sample values). - - *mode* is a string that specifies the image colour format in a - PIL-style mode. It can be: - - ``'L'`` - greyscale (1 channel) - ``'LA'`` - greyscale with alpha (2 channel) - ``'RGB'`` - colour image (3 channel) - ``'RGBA'`` - colour image with alpha (4 channel) - - The mode string can also specify the bit depth - (overriding how this function normally derives the bit depth, - see below). - Appending ``';16'`` to the mode will cause the PNG to be - 16 bits per channel; - any decimal from 1 to 16 can be used to specify the bit depth. - - When a 2-dimensional array is used *mode* determines how many - channels the image has, and so allows the width to be derived from - the second array dimension. - - The array is expected to be a ``numpy`` array, - but it can be any suitable Python sequence. - For example, a list of lists can be used: - ``png.from_array([[0, 255, 0], [255, 0, 255]], 'L')``. - The exact rules are: ``len(a)`` gives the first dimension, height; - ``len(a[0])`` gives the second dimension. - It's slightly more complicated than that because - an iterator of rows can be used, and it all still works. - Using an iterator allows data to be streamed efficiently. - - The bit depth of the PNG is normally taken from - the array element's datatype - (but if *mode* specifies a bitdepth then that is used instead). - The array element's datatype is determined in a way which - is supposed to work both for ``numpy`` arrays and for Python - ``array.array`` objects. - A 1 byte datatype will give a bit depth of 8, - a 2 byte datatype will give a bit depth of 16. - If the datatype does not have an implicit size, - like the above example where it is a plain Python list of lists, - then a default of 8 is used. - - The *info* parameter is a dictionary that can - be used to specify metadata (in the same style as - the arguments to the :class:`png.Writer` class). - For this function the keys that are useful are: - - height - overrides the height derived from the array dimensions and - allows *a* to be an iterable. - width - overrides the width derived from the array dimensions. - bitdepth - overrides the bit depth derived from the element datatype - (but must match *mode* if that also specifies a bit depth). - - Generally anything specified in the *info* dictionary will - override any implicit choices that this function would otherwise make, - but must match any explicit ones. - For example, if the *info* dictionary has a ``greyscale`` key then - this must be true when mode is ``'L'`` or ``'LA'`` and - false when mode is ``'RGB'`` or ``'RGBA'``. - """ - - # We abuse the *info* parameter by modifying it. Take a copy here. - # (Also typechecks *info* to some extent). - info = dict(info) - - # Syntax check mode string. - match = RegexModeDecode.match(mode) - if not match: - raise Error("mode string should be 'RGB' or 'L;16' or similar.") - - mode, bitdepth = match.groups() - if bitdepth: - bitdepth = int(bitdepth) - - # Colour format. - if 'greyscale' in info: - if bool(info['greyscale']) != ('L' in mode): - raise ProtocolError("info['greyscale'] should match mode.") - info['greyscale'] = 'L' in mode - - alpha = 'A' in mode - if 'alpha' in info: - if bool(info['alpha']) != alpha: - raise ProtocolError("info['alpha'] should match mode.") - info['alpha'] = alpha - - # Get bitdepth from *mode* if possible. - if bitdepth: - if info.get("bitdepth") and bitdepth != info['bitdepth']: - raise ProtocolError( - "bitdepth (%d) should match bitdepth of info (%d)." % - (bitdepth, info['bitdepth'])) - info['bitdepth'] = bitdepth - - # Fill in and/or check entries in *info*. - # Dimensions. - width, height = check_sizes( - info.get("size"), - info.get("width"), - info.get("height")) - if width: - info["width"] = width - if height: - info["height"] = height - - if "height" not in info: - try: - info['height'] = len(a) - except TypeError: - raise ProtocolError( - "len(a) does not work, supply info['height'] instead.") - - planes = len(mode) - if 'planes' in info: - if info['planes'] != planes: - raise Error("info['planes'] should match mode.") - - # In order to work out whether we the array is 2D or 3D we need its - # first row, which requires that we take a copy of its iterator. - # We may also need the first row to derive width and bitdepth. - a, t = itertools.tee(a) - row = next(t) - del t - - testelement = row - if 'width' not in info: - width = len(row) // planes - info['width'] = width - - if 'bitdepth' not in info: - try: - dtype = testelement.dtype - # goto the "else:" clause. Sorry. - except AttributeError: - try: - # Try a Python array.array. - bitdepth = 8 * testelement.itemsize - except AttributeError: - # We can't determine it from the array element's datatype, - # use a default of 8. - bitdepth = 8 - else: - # If we got here without exception, - # we now assume that the array is a numpy array. - if dtype.kind == 'b': - bitdepth = 1 - else: - bitdepth = 8 * dtype.itemsize - info['bitdepth'] = bitdepth - - for thing in ["width", "height", "bitdepth", "greyscale", "alpha"]: - assert thing in info - - return Image(a, info) - - -# So that refugee's from PIL feel more at home. Not documented. -fromarray = from_array - - -class Image: - """A PNG image. You can create an :class:`Image` object from - an array of pixels by calling :meth:`png.from_array`. It can be - saved to disk with the :meth:`save` method. - """ - - def __init__(self, rows, info): - """ - .. note :: - - The constructor is not public. Please do not call it. - """ - - self.rows = rows - self.info = info - - def save(self, file): - """Save the image to the named *file*. - - See `.write()` if you already have an open file object. - - In general, you can only call this method once; - after it has been called the first time the PNG image is written, - the source data will have been streamed, and - cannot be streamed again. - """ - - w = Writer(**self.info) - - with open(file, 'wb') as fd: - w.write(fd, self.rows) - - def write(self, file): - """Write the image to the open file object. - - See `.save()` if you have a filename. - - In general, you can only call this method once; - after it has been called the first time the PNG image is written, - the source data will have been streamed, and - cannot be streamed again. - """ - - w = Writer(**self.info) - w.write(file, self.rows) - - -class Reader: - """ - Pure Python PNG decoder in pure Python. - """ - - def __init__(self, _guess=None, filename=None, file=None, bytes=None): - """ - The constructor expects exactly one keyword argument. - If you supply a positional argument instead, - it will guess the input type. - Choose from the following keyword arguments: - - filename - Name of input file (a PNG file). - file - A file-like object (object with a read() method). - bytes - ``bytes`` or ``bytearray`` with PNG data. - - """ - keywords_supplied = ( - (_guess is not None) + - (filename is not None) + - (file is not None) + - (bytes is not None)) - if keywords_supplied != 1: - raise TypeError("Reader() takes exactly 1 argument") - - # Will be the first 8 bytes, later on. See validate_signature. - self.signature = None - self.transparent = None - # A pair of (len,type) if a chunk has been read but its data and - # checksum have not (in other words the file position is just - # past the 4 bytes that specify the chunk type). - # See preamble method for how this is used. - self.atchunk = None - - if _guess is not None: - if isarray(_guess): - bytes = _guess - elif isinstance(_guess, str): - filename = _guess - elif hasattr(_guess, 'read'): - file = _guess - - if bytes is not None: - self.file = io.BytesIO(bytes) - elif filename is not None: - self.file = open(filename, "rb") - elif file is not None: - self.file = file - else: - raise ProtocolError("expecting filename, file or bytes array") - - def chunk(self, lenient=False): - """ - Read the next PNG chunk from the input file; - returns a (*type*, *data*) tuple. - *type* is the chunk's type as a byte string - (all PNG chunk types are 4 bytes long). - *data* is the chunk's data content, as a byte string. - - If the optional `lenient` argument evaluates to `True`, - checksum failures will raise warnings rather than exceptions. - """ - - self.validate_signature() - - # http://www.w3.org/TR/PNG/#5Chunk-layout - if not self.atchunk: - self.atchunk = self._chunk_len_type() - if not self.atchunk: - raise ChunkError("No more chunks.") - length, type = self.atchunk - self.atchunk = None - - data = self.file.read(length) - if len(data) != length: - raise ChunkError( - 'Chunk %s too short for required %i octets.' - % (type, length)) - checksum = self.file.read(4) - if len(checksum) != 4: - raise ChunkError('Chunk %s too short for checksum.' % type) - verify = zlib.crc32(type) - verify = zlib.crc32(data, verify) - verify = struct.pack('!I', verify) - if checksum != verify: - (a, ) = struct.unpack('!I', checksum) - (b, ) = struct.unpack('!I', verify) - message = ("Checksum error in %s chunk: 0x%08X != 0x%08X." - % (type.decode('ascii'), a, b)) - if lenient: - warnings.warn(message, RuntimeWarning) - else: - raise ChunkError(message) - return type, data - - def chunks(self): - """Return an iterator that will yield each chunk as a - (*chunktype*, *content*) pair. - """ - - while True: - t, v = self.chunk() - yield t, v - if t == b'IEND': - break - - def undo_filter(self, filter_type, scanline, previous): - """ - Undo the filter for a scanline. - `scanline` is a sequence of bytes that - does not include the initial filter type byte. - `previous` is decoded previous scanline - (for straightlaced images this is the previous pixel row, - but for interlaced images, it is - the previous scanline in the reduced image, - which in general is not the previous pixel row in the final image). - When there is no previous scanline - (the first row of a straightlaced image, - or the first row in one of the passes in an interlaced image), - then this argument should be ``None``. - - The scanline will have the effects of filtering removed; - the result will be returned as a fresh sequence of bytes. - """ - - # :todo: Would it be better to update scanline in place? - result = scanline - - if filter_type == 0: - return result - - if filter_type not in (1, 2, 3, 4): - raise FormatError( - 'Invalid PNG Filter Type. ' - 'See http://www.w3.org/TR/2003/REC-PNG-20031110/#9Filters .') - - # Filter unit. The stride from one pixel to the corresponding - # byte from the previous pixel. Normally this is the pixel - # size in bytes, but when this is smaller than 1, the previous - # byte is used instead. - fu = max(1, self.psize) - - # For the first line of a pass, synthesize a dummy previous - # line. An alternative approach would be to observe that on the - # first line 'up' is the same as 'null', 'paeth' is the same - # as 'sub', with only 'average' requiring any special case. - if not previous: - previous = bytearray([0] * len(scanline)) - - # Call appropriate filter algorithm. Note that 0 has already - # been dealt with. - fn = (None, - undo_filter_sub, - undo_filter_up, - undo_filter_average, - undo_filter_paeth)[filter_type] - fn(fu, scanline, previous, result) - return result - - def _deinterlace(self, raw): - """ - Read raw pixel data, undo filters, deinterlace, and flatten. - Return a single array of values. - """ - - # Values per row (of the target image) - vpr = self.width * self.planes - - # Values per image - vpi = vpr * self.height - # Interleaving writes to the output array randomly - # (well, not quite), so the entire output array must be in memory. - # Make a result array, and make it big enough. - if self.bitdepth > 8: - a = array('H', [0] * vpi) - else: - a = bytearray([0] * vpi) - source_offset = 0 - - for lines in adam7_generate(self.width, self.height): - # The previous (reconstructed) scanline. - # `None` at the beginning of a pass - # to indicate that there is no previous line. - recon = None - for x, y, xstep in lines: - # Pixels per row (reduced pass image) - ppr = int(math.ceil((self.width - x) / float(xstep))) - # Row size in bytes for this pass. - row_size = int(math.ceil(self.psize * ppr)) - - filter_type = raw[source_offset] - source_offset += 1 - scanline = raw[source_offset: source_offset + row_size] - source_offset += row_size - recon = self.undo_filter(filter_type, scanline, recon) - # Convert so that there is one element per pixel value - flat = self._bytes_to_values(recon, width=ppr) - if xstep == 1: - assert x == 0 - offset = y * vpr - a[offset: offset + vpr] = flat - else: - offset = y * vpr + x * self.planes - end_offset = (y + 1) * vpr - skip = self.planes * xstep - for i in range(self.planes): - a[offset + i: end_offset: skip] = \ - flat[i:: self.planes] - - return a - - def _iter_bytes_to_values(self, byte_rows): - """ - Iterator that yields each scanline; - each scanline being a sequence of values. - `byte_rows` should be an iterator that yields - the bytes of each row in turn. - """ - - for row in byte_rows: - yield self._bytes_to_values(row) - - def _bytes_to_values(self, bs, width=None): - """Convert a packed row of bytes into a row of values. - Result will be a freshly allocated object, - not shared with the argument. - """ - - if self.bitdepth == 8: - return bytearray(bs) - if self.bitdepth == 16: - return array('H', - struct.unpack('!%dH' % (len(bs) // 2), bs)) - - assert self.bitdepth < 8 - if width is None: - width = self.width - # Samples per byte - spb = 8 // self.bitdepth - out = bytearray() - mask = 2**self.bitdepth - 1 - shifts = [self.bitdepth * i - for i in reversed(list(range(spb)))] - for o in bs: - out.extend([mask & (o >> i) for i in shifts]) - return out[:width] - - def _iter_straight_packed(self, byte_blocks): - """Iterator that undoes the effect of filtering; - yields each row as a sequence of packed bytes. - Assumes input is straightlaced. - `byte_blocks` should be an iterable that yields the raw bytes - in blocks of arbitrary size. - """ - - # length of row, in bytes - rb = self.row_bytes - a = bytearray() - # The previous (reconstructed) scanline. - # None indicates first line of image. - recon = None - for some_bytes in byte_blocks: - a.extend(some_bytes) - while len(a) >= rb + 1: - filter_type = a[0] - scanline = a[1: rb + 1] - del a[: rb + 1] - recon = self.undo_filter(filter_type, scanline, recon) - yield recon - if len(a) != 0: - # :file:format We get here with a file format error: - # when the available bytes (after decompressing) do not - # pack into exact rows. - raise FormatError('Wrong size for decompressed IDAT chunk.') - assert len(a) == 0 - - def validate_signature(self): - """ - If signature (header) has not been read then read and - validate it; otherwise do nothing. - No signature (empty read()) will raise EOFError; - An invalid signature will raise FormatError. - EOFError is raised to make possible the case where - a program can read multiple PNG files from the same stream. - The end of the stream can be distinguished from non-PNG files - or corrupted PNG files. - """ - - if self.signature: - return - self.signature = self.file.read(8) - if len(self.signature) == 0: - raise EOFError("End of PNG stream.") - if self.signature != signature: - raise FormatError("PNG file has invalid signature.") - - def preamble(self, lenient=False): - """ - Extract the image metadata by reading - the initial part of the PNG file up to - the start of the ``IDAT`` chunk. - All the chunks that precede the ``IDAT`` chunk are - read and either processed for metadata or discarded. - - If the optional `lenient` argument evaluates to `True`, - checksum failures will raise warnings rather than exceptions. - """ - - self.validate_signature() - - while True: - if not self.atchunk: - self.atchunk = self._chunk_len_type() - if self.atchunk is None: - raise FormatError('This PNG file has no IDAT chunks.') - if self.atchunk[1] == b'IDAT': - return - self.process_chunk(lenient=lenient) - - def _chunk_len_type(self): - """ - Reads just enough of the input to - determine the next chunk's length and type; - return a (*length*, *type*) pair where *type* is a byte sequence. - If there are no more chunks, ``None`` is returned. - """ - - x = self.file.read(8) - if not x: - return None - if len(x) != 8: - raise FormatError( - 'End of file whilst reading chunk length and type.') - length, type = struct.unpack('!I4s', x) - if length > 2 ** 31 - 1: - raise FormatError('Chunk %s is too large: %d.' % (type, length)) - # Check that all bytes are in valid ASCII range. - # https://www.w3.org/TR/2003/REC-PNG-20031110/#5Chunk-layout - type_bytes = set(bytearray(type)) - if not(type_bytes <= set(range(65, 91)) | set(range(97, 123))): - raise FormatError( - 'Chunk %r has invalid Chunk Type.' - % list(type)) - return length, type - - def process_chunk(self, lenient=False): - """ - Process the next chunk and its data. - This only processes the following chunk types: - ``IHDR``, ``PLTE``, ``bKGD``, ``tRNS``, ``gAMA``, ``sBIT``, ``pHYs``. - All other chunk types are ignored. - - If the optional `lenient` argument evaluates to `True`, - checksum failures will raise warnings rather than exceptions. - """ - - type, data = self.chunk(lenient=lenient) - method = '_process_' + type.decode('ascii') - m = getattr(self, method, None) - if m: - m(data) - - def _process_IHDR(self, data): - # http://www.w3.org/TR/PNG/#11IHDR - if len(data) != 13: - raise FormatError('IHDR chunk has incorrect length.') - (self.width, self.height, self.bitdepth, self.color_type, - self.compression, self.filter, - self.interlace) = struct.unpack("!2I5B", data) - - check_bitdepth_colortype(self.bitdepth, self.color_type) - - if self.compression != 0: - raise FormatError( - "Unknown compression method %d" % self.compression) - if self.filter != 0: - raise FormatError( - "Unknown filter method %d," - " see http://www.w3.org/TR/2003/REC-PNG-20031110/#9Filters ." - % self.filter) - if self.interlace not in (0, 1): - raise FormatError( - "Unknown interlace method %d, see " - "http://www.w3.org/TR/2003/REC-PNG-20031110/#8InterlaceMethods" - " ." - % self.interlace) - - # Derived values - # http://www.w3.org/TR/PNG/#6Colour-values - colormap = bool(self.color_type & 1) - greyscale = not(self.color_type & 2) - alpha = bool(self.color_type & 4) - color_planes = (3, 1)[greyscale or colormap] - planes = color_planes + alpha - - self.colormap = colormap - self.greyscale = greyscale - self.alpha = alpha - self.color_planes = color_planes - self.planes = planes - self.psize = float(self.bitdepth) / float(8) * planes - if int(self.psize) == self.psize: - self.psize = int(self.psize) - self.row_bytes = int(math.ceil(self.width * self.psize)) - # Stores PLTE chunk if present, and is used to check - # chunk ordering constraints. - self.plte = None - # Stores tRNS chunk if present, and is used to check chunk - # ordering constraints. - self.trns = None - # Stores sBIT chunk if present. - self.sbit = None - - def _process_PLTE(self, data): - # http://www.w3.org/TR/PNG/#11PLTE - if self.plte: - warnings.warn("Multiple PLTE chunks present.") - self.plte = data - if len(data) % 3 != 0: - raise FormatError( - "PLTE chunk's length should be a multiple of 3.") - if len(data) > (2 ** self.bitdepth) * 3: - raise FormatError("PLTE chunk is too long.") - if len(data) == 0: - raise FormatError("Empty PLTE is not allowed.") - - def _process_bKGD(self, data): - try: - if self.colormap: - if not self.plte: - warnings.warn( - "PLTE chunk is required before bKGD chunk.") - self.background = struct.unpack('B', data) - else: - self.background = struct.unpack("!%dH" % self.color_planes, - data) - except struct.error: - raise FormatError("bKGD chunk has incorrect length.") - - def _process_tRNS(self, data): - # http://www.w3.org/TR/PNG/#11tRNS - self.trns = data - if self.colormap: - if not self.plte: - warnings.warn("PLTE chunk is required before tRNS chunk.") - else: - if len(data) > len(self.plte) / 3: - # Was warning, but promoted to Error as it - # would otherwise cause pain later on. - raise FormatError("tRNS chunk is too long.") - else: - if self.alpha: - raise FormatError( - "tRNS chunk is not valid with colour type %d." % - self.color_type) - try: - self.transparent = \ - struct.unpack("!%dH" % self.color_planes, data) - except struct.error: - raise FormatError("tRNS chunk has incorrect length.") - - def _process_gAMA(self, data): - try: - self.gamma = struct.unpack("!L", data)[0] / 100000.0 - except struct.error: - raise FormatError("gAMA chunk has incorrect length.") - - def _process_sBIT(self, data): - self.sbit = data - if (self.colormap and len(data) != 3 or - not self.colormap and len(data) != self.planes): - raise FormatError("sBIT chunk has incorrect length.") - - def _process_pHYs(self, data): - # http://www.w3.org/TR/PNG/#11pHYs - self.phys = data - fmt = "!LLB" - if len(data) != struct.calcsize(fmt): - raise FormatError("pHYs chunk has incorrect length.") - self.x_pixels_per_unit, self.y_pixels_per_unit, unit = \ - struct.unpack(fmt, data) - self.unit_is_meter = bool(unit) - - def read(self, lenient=False): - """ - Read the PNG file and decode it. - Returns (`width`, `height`, `rows`, `info`). - - May use excessive memory. - - `rows` is a sequence of rows; - each row is a sequence of values. - - If the optional `lenient` argument evaluates to True, - checksum failures will raise warnings rather than exceptions. - """ - - def iteridat(): - """Iterator that yields all the ``IDAT`` chunks as strings.""" - while True: - type, data = self.chunk(lenient=lenient) - if type == b'IEND': - # http://www.w3.org/TR/PNG/#11IEND - break - if type != b'IDAT': - continue - # type == b'IDAT' - # http://www.w3.org/TR/PNG/#11IDAT - if self.colormap and not self.plte: - warnings.warn("PLTE chunk is required before IDAT chunk") - yield data - - self.preamble(lenient=lenient) - raw = decompress(iteridat()) - - if self.interlace: - def rows_from_interlace(): - """Yield each row from an interlaced PNG.""" - # It's important that this iterator doesn't read - # IDAT chunks until it yields the first row. - bs = bytearray(itertools.chain(*raw)) - arraycode = 'BH'[self.bitdepth > 8] - # Like :meth:`group` but - # producing an array.array object for each row. - values = self._deinterlace(bs) - vpr = self.width * self.planes - for i in range(0, len(values), vpr): - row = array(arraycode, values[i:i+vpr]) - yield row - rows = rows_from_interlace() - else: - rows = self._iter_bytes_to_values(self._iter_straight_packed(raw)) - info = dict() - for attr in 'greyscale alpha planes bitdepth interlace'.split(): - info[attr] = getattr(self, attr) - info['size'] = (self.width, self.height) - for attr in 'gamma transparent background'.split(): - a = getattr(self, attr, None) - if a is not None: - info[attr] = a - if getattr(self, 'x_pixels_per_unit', None): - info['physical'] = Resolution(self.x_pixels_per_unit, - self.y_pixels_per_unit, - self.unit_is_meter) - if self.plte: - info['palette'] = self.palette() - return self.width, self.height, rows, info - - def read_flat(self): - """ - Read a PNG file and decode it into a single array of values. - Returns (*width*, *height*, *values*, *info*). - - May use excessive memory. - - `values` is a single array. - - The :meth:`read` method is more stream-friendly than this, - because it returns a sequence of rows. - """ - - x, y, pixel, info = self.read() - arraycode = 'BH'[info['bitdepth'] > 8] - pixel = array(arraycode, itertools.chain(*pixel)) - return x, y, pixel, info - - def palette(self, alpha='natural'): - """ - Returns a palette that is a sequence of 3-tuples or 4-tuples, - synthesizing it from the ``PLTE`` and ``tRNS`` chunks. - These chunks should have already been processed (for example, - by calling the :meth:`preamble` method). - All the tuples are the same size: - 3-tuples if there is no ``tRNS`` chunk, - 4-tuples when there is a ``tRNS`` chunk. - - Assumes that the image is colour type - 3 and therefore a ``PLTE`` chunk is required. - - If the `alpha` argument is ``'force'`` then an alpha channel is - always added, forcing the result to be a sequence of 4-tuples. - """ - - if not self.plte: - raise FormatError( - "Required PLTE chunk is missing in colour type 3 image.") - plte = group(array('B', self.plte), 3) - if self.trns or alpha == 'force': - trns = array('B', self.trns or []) - trns.extend([255] * (len(plte) - len(trns))) - plte = list(map(operator.add, plte, group(trns, 1))) - return plte - - def asDirect(self): - """ - Returns the image data as a direct representation of - an ``x * y * planes`` array. - This removes the need for callers to deal with - palettes and transparency themselves. - Images with a palette (colour type 3) are converted to RGB or RGBA; - images with transparency (a ``tRNS`` chunk) are converted to - LA or RGBA as appropriate. - When returned in this format the pixel values represent - the colour value directly without needing to refer - to palettes or transparency information. - - Like the :meth:`read` method this method returns a 4-tuple: - - (*width*, *height*, *rows*, *info*) - - This method normally returns pixel values with - the bit depth they have in the source image, but - when the source PNG has an ``sBIT`` chunk it is inspected and - can reduce the bit depth of the result pixels; - pixel values will be reduced according to the bit depth - specified in the ``sBIT`` chunk. - PNG nerds should note a single result bit depth is - used for all channels: - the maximum of the ones specified in the ``sBIT`` chunk. - An RGB565 image will be rescaled to 6-bit RGB666. - - The *info* dictionary that is returned reflects - the `direct` format and not the original source image. - For example, an RGB source image with a ``tRNS`` chunk - to represent a transparent colour, - will start with ``planes=3`` and ``alpha=False`` for the - source image, - but the *info* dictionary returned by this method - will have ``planes=4`` and ``alpha=True`` because - an alpha channel is synthesized and added. - - *rows* is a sequence of rows; - each row being a sequence of values - (like the :meth:`read` method). - - All the other aspects of the image data are not changed. - """ - - self.preamble() - - # Simple case, no conversion necessary. - if not self.colormap and not self.trns and not self.sbit: - return self.read() - - x, y, pixels, info = self.read() - - if self.colormap: - info['colormap'] = False - info['alpha'] = bool(self.trns) - info['bitdepth'] = 8 - info['planes'] = 3 + bool(self.trns) - plte = self.palette() - - def iterpal(pixels): - for row in pixels: - row = [plte[x] for x in row] - yield array('B', itertools.chain(*row)) - pixels = iterpal(pixels) - elif self.trns: - # It would be nice if there was some reasonable way - # of doing this without generating a whole load of - # intermediate tuples. But tuples does seem like the - # easiest way, with no other way clearly much simpler or - # much faster. (Actually, the L to LA conversion could - # perhaps go faster (all those 1-tuples!), but I still - # wonder whether the code proliferation is worth it) - it = self.transparent - maxval = 2 ** info['bitdepth'] - 1 - planes = info['planes'] - info['alpha'] = True - info['planes'] += 1 - typecode = 'BH'[info['bitdepth'] > 8] - - def itertrns(pixels): - for row in pixels: - # For each row we group it into pixels, then form a - # characterisation vector that says whether each - # pixel is opaque or not. Then we convert - # True/False to 0/maxval (by multiplication), - # and add it as the extra channel. - row = group(row, planes) - opa = map(it.__ne__, row) - opa = map(maxval.__mul__, opa) - opa = list(zip(opa)) # convert to 1-tuples - yield array( - typecode, - itertools.chain(*map(operator.add, row, opa))) - pixels = itertrns(pixels) - targetbitdepth = None - if self.sbit: - sbit = struct.unpack('%dB' % len(self.sbit), self.sbit) - targetbitdepth = max(sbit) - if targetbitdepth > info['bitdepth']: - raise Error('sBIT chunk %r exceeds bitdepth %d' % - (sbit, self.bitdepth)) - if min(sbit) <= 0: - raise Error('sBIT chunk %r has a 0-entry' % sbit) - if targetbitdepth: - shift = info['bitdepth'] - targetbitdepth - info['bitdepth'] = targetbitdepth - - def itershift(pixels): - for row in pixels: - yield [p >> shift for p in row] - pixels = itershift(pixels) - return x, y, pixels, info - - def _as_rescale(self, get, targetbitdepth): - """Helper used by :meth:`asRGB8` and :meth:`asRGBA8`.""" - - width, height, pixels, info = get() - maxval = 2**info['bitdepth'] - 1 - targetmaxval = 2**targetbitdepth - 1 - factor = float(targetmaxval) / float(maxval) - info['bitdepth'] = targetbitdepth - - def iterscale(): - for row in pixels: - yield [int(round(x * factor)) for x in row] - if maxval == targetmaxval: - return width, height, pixels, info - else: - return width, height, iterscale(), info - - def asRGB8(self): - """ - Return the image data as an RGB pixels with 8-bits per sample. - This is like the :meth:`asRGB` method except that - this method additionally rescales the values so that - they are all between 0 and 255 (8-bit). - In the case where the source image has a bit depth < 8 - the transformation preserves all the information; - where the source image has bit depth > 8, then - rescaling to 8-bit values loses precision. - No dithering is performed. - Like :meth:`asRGB`, - an alpha channel in the source image will raise an exception. - - This function returns a 4-tuple: - (*width*, *height*, *rows*, *info*). - *width*, *height*, *info* are as per the :meth:`read` method. - - *rows* is the pixel data as a sequence of rows. - """ - - return self._as_rescale(self.asRGB, 8) - - def asRGBA8(self): - """ - Return the image data as RGBA pixels with 8-bits per sample. - This method is similar to :meth:`asRGB8` and :meth:`asRGBA`: - The result pixels have an alpha channel, *and* - values are rescaled to the range 0 to 255. - The alpha channel is synthesized if necessary - (with a small speed penalty). - """ - - return self._as_rescale(self.asRGBA, 8) - - def asRGB(self): - """ - Return image as RGB pixels. - RGB colour images are passed through unchanged; - greyscales are expanded into RGB triplets - (there is a small speed overhead for doing this). - - An alpha channel in the source image will raise an exception. - - The return values are as for the :meth:`read` method except that - the *info* reflect the returned pixels, not the source image. - In particular, - for this method ``info['greyscale']`` will be ``False``. - """ - - width, height, pixels, info = self.asDirect() - if info['alpha']: - raise Error("will not convert image with alpha channel to RGB") - if not info['greyscale']: - return width, height, pixels, info - info['greyscale'] = False - info['planes'] = 3 - - if info['bitdepth'] > 8: - def newarray(): - return array('H', [0]) - else: - def newarray(): - return bytearray([0]) - - def iterrgb(): - for row in pixels: - a = newarray() * 3 * width - for i in range(3): - a[i::3] = row - yield a - return width, height, iterrgb(), info - - def asRGBA(self): - """ - Return image as RGBA pixels. - Greyscales are expanded into RGB triplets; - an alpha channel is synthesized if necessary. - The return values are as for the :meth:`read` method except that - the *info* reflect the returned pixels, not the source image. - In particular, for this method - ``info['greyscale']`` will be ``False``, and - ``info['alpha']`` will be ``True``. - """ - - width, height, pixels, info = self.asDirect() - if info['alpha'] and not info['greyscale']: - return width, height, pixels, info - typecode = 'BH'[info['bitdepth'] > 8] - maxval = 2**info['bitdepth'] - 1 - maxbuffer = struct.pack('=' + typecode, maxval) * 4 * width - - if info['bitdepth'] > 8: - def newarray(): - return array('H', maxbuffer) - else: - def newarray(): - return bytearray(maxbuffer) - - if info['alpha'] and info['greyscale']: - # LA to RGBA - def convert(): - for row in pixels: - # Create a fresh target row, then copy L channel - # into first three target channels, and A channel - # into fourth channel. - a = newarray() - convert_la_to_rgba(row, a) - yield a - elif info['greyscale']: - # L to RGBA - def convert(): - for row in pixels: - a = newarray() - convert_l_to_rgba(row, a) - yield a - else: - assert not info['alpha'] and not info['greyscale'] - # RGB to RGBA - - def convert(): - for row in pixels: - a = newarray() - convert_rgb_to_rgba(row, a) - yield a - info['alpha'] = True - info['greyscale'] = False - info['planes'] = 4 - return width, height, convert(), info - - -def decompress(data_blocks): - """ - `data_blocks` should be an iterable that - yields the compressed data (from the ``IDAT`` chunks). - This yields decompressed byte strings. - """ - - # Currently, with no max_length parameter to decompress, - # this routine will do one yield per IDAT chunk: Not very - # incremental. - d = zlib.decompressobj() - # Each IDAT chunk is passed to the decompressor, then any - # remaining state is decompressed out. - for data in data_blocks: - # :todo: add a max_length argument here to limit output size. - yield bytearray(d.decompress(data)) - yield bytearray(d.flush()) - - -def check_bitdepth_colortype(bitdepth, colortype): - """ - Check that `bitdepth` and `colortype` are both valid, - and specified in a valid combination. - Returns (None) if valid, raise an Exception if not valid. - """ - - if bitdepth not in (1, 2, 4, 8, 16): - raise FormatError("invalid bit depth %d" % bitdepth) - if colortype not in (0, 2, 3, 4, 6): - raise FormatError("invalid colour type %d" % colortype) - # Check indexed (palettized) images have 8 or fewer bits - # per pixel; check only indexed or greyscale images have - # fewer than 8 bits per pixel. - if colortype & 1 and bitdepth > 8: - raise FormatError( - "Indexed images (colour type %d) cannot" - " have bitdepth > 8 (bit depth %d)." - " See http://www.w3.org/TR/2003/REC-PNG-20031110/#table111 ." - % (bitdepth, colortype)) - if bitdepth < 8 and colortype not in (0, 3): - raise FormatError( - "Illegal combination of bit depth (%d)" - " and colour type (%d)." - " See http://www.w3.org/TR/2003/REC-PNG-20031110/#table111 ." - % (bitdepth, colortype)) - - -def is_natural(x): - """A non-negative integer.""" - try: - is_integer = int(x) == x - except (TypeError, ValueError): - return False - return is_integer and x >= 0 - - -def undo_filter_sub(filter_unit, scanline, previous, result): - """Undo sub filter.""" - - ai = 0 - # Loops starts at index fu. Observe that the initial part - # of the result is already filled in correctly with - # scanline. - for i in range(filter_unit, len(result)): - x = scanline[i] - a = result[ai] - result[i] = (x + a) & 0xff - ai += 1 - - -def undo_filter_up(filter_unit, scanline, previous, result): - """Undo up filter.""" - - for i in range(len(result)): - x = scanline[i] - b = previous[i] - result[i] = (x + b) & 0xff - - -def undo_filter_average(filter_unit, scanline, previous, result): - """Undo up filter.""" - - ai = -filter_unit - for i in range(len(result)): - x = scanline[i] - if ai < 0: - a = 0 - else: - a = result[ai] - b = previous[i] - result[i] = (x + ((a + b) >> 1)) & 0xff - ai += 1 - - -def undo_filter_paeth(filter_unit, scanline, previous, result): - """Undo Paeth filter.""" - - # Also used for ci. - ai = -filter_unit - for i in range(len(result)): - x = scanline[i] - if ai < 0: - a = c = 0 - else: - a = result[ai] - c = previous[ai] - b = previous[i] - p = a + b - c - pa = abs(p - a) - pb = abs(p - b) - pc = abs(p - c) - if pa <= pb and pa <= pc: - pr = a - elif pb <= pc: - pr = b - else: - pr = c - result[i] = (x + pr) & 0xff - ai += 1 - - -def convert_la_to_rgba(row, result): - for i in range(3): - result[i::4] = row[0::2] - result[3::4] = row[1::2] - - -def convert_l_to_rgba(row, result): - """ - Convert a grayscale image to RGBA. - This method assumes the alpha channel in result is - already correctly initialized. - """ - for i in range(3): - result[i::4] = row - - -def convert_rgb_to_rgba(row, result): - """ - Convert an RGB image to RGBA. - This method assumes the alpha channel in result is - already correctly initialized. - """ - for i in range(3): - result[i::4] = row[i::3] - - -# Only reason to include this in this module is that -# several utilities need it, and it is small. -def binary_stdin(): - """ - A sys.stdin that returns bytes. - """ - - return sys.stdin.buffer - - -def binary_stdout(): - """ - A sys.stdout that accepts bytes. - """ - - stdout = sys.stdout.buffer - - # On Windows the C runtime file orientation needs changing. - if sys.platform == "win32": - import msvcrt - import os - msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) - - return stdout - - -def cli_open(path): - if path == "-": - return binary_stdin() - return open(path, "rb") - - -def main(argv): - """ - Run command line PNG. - Which reports version. - """ - print(__version__, __file__) - - -if __name__ == '__main__': - try: - main(sys.argv) - except Error as e: - print(e, file=sys.stderr) diff --git a/tools/rgb555.py b/tools/rgb555.py deleted file mode 100755 index bf650313b4f..00000000000 --- a/tools/rgb555.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -Usage: python rgb555.py image.png - -Round all colors of the input image to RGB555. -""" - -import sys - -import png - -def rgb8_to_rgb5(c): - return (c & 0b11111000) | (c >> 5) - -def round_pal(filename): - with open(filename, 'rb') as file: - width, height, rows = png.Reader(file).asRGBA8()[:3] - rows = list(rows) - for row in rows: - del row[3::4] - rows = [[rgb8_to_rgb5(c) for c in row] for row in rows] - writer = png.Writer(width, height, greyscale=False, bitdepth=8, compression=9) - with open(filename, 'wb') as file: - writer.write(file, rows) - -def main(): - if len(sys.argv) < 2: - print(f'Usage: {sys.argv[0]} pic.png', file=sys.stderr) - sys.exit(1) - for filename in sys.argv[1:]: - if not filename.lower().endswith('.png'): - print(f'{filename} is not a .png file!', file=sys.stderr) - round_pal(filename) - -if __name__ == '__main__': - main() diff --git a/tools/sym_comments.py b/tools/sym_comments.py deleted file mode 100755 index 9d8897d776c..00000000000 --- a/tools/sym_comments.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -Usage: python sym_comments.py file.asm [pokecrystal.sym] > file_commented.asm - -Comments each label in file.asm with its bank:address from the sym file. -""" - -import sys -import re - -def main(): - if len(sys.argv) not in {2, 3}: - print(f'Usage: {sys.argv[0]} file.asm [pokecrystal.sym] > file_commented.asm', file=sys.stderr) - sys.exit(1) - - wram_name = sys.argv[1] - sym_name = sys.argv[2] if len(sys.argv) == 3 else 'pokecrystal.sym' - - sym_def_rx = re.compile(r'(^{sym})(:.*)|(^\.{sym})(.*)'.format(sym=r'[A-Za-z_][A-Za-z0-9_#@]*')) - - sym_addrs = {} - with open(sym_name, 'r', encoding='utf-8') as file: - for line in file: - line = line.split(';', 1)[0].rstrip() - parts = line.split(' ', 1) - if len(parts) != 2: - continue - addr, sym = parts - sym_addrs[sym] = addr - - with open(wram_name, 'r', encoding='utf-8') as file: - cur_label = None - for line in file: - line = line.rstrip() - if (m := re.match(sym_def_rx, line)): - sym, rest = m.group(1), m.group(2) - if sym is None and rest is None: - sym, rest = m.group(3), m.group(4) - key = sym - if not sym.startswith('.'): - cur_label = sym - elif cur_label: - key = cur_label + sym - if key in sym_addrs: - addr = sym_addrs[key] - line = sym + rest + ' ; ' + addr - print(line) - -if __name__ == '__main__': - main() diff --git a/tools/toc.py b/tools/toc.py deleted file mode 100755 index d9a3d963dc8..00000000000 --- a/tools/toc.py +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -Usage: python toc.py file.md - -Replace a "## TOC" heading in a Markdown file with a table of contents, -generated from the other headings in the file. Supports multiple files. -Headings must start with "##" signs to be detected. -""" - -import sys -import re -from collections import namedtuple -from urllib.parse import quote - -toc_name = 'Contents' -valid_toc_headings = {'## TOC', '##TOC'} - -TocItem = namedtuple('TocItem', ['name', 'anchor', 'level']) -punctuation_rx = re.compile(r'[^\w\- ]+') -numbered_heading_rx = re.compile(r'^[0-9]+\. ') -specialchar_rx = re.compile(r'[⅔]+') - -def name_to_anchor(name): - # GitHub's algorithm for generating anchors from headings - # https://github.com/jch/html-pipeline/blob/master/lib/html/pipeline/toc_filter.rb - anchor = name.strip().lower() # lowercase - anchor = re.sub(punctuation_rx, '', anchor) # remove punctuation - anchor = anchor.replace(' ', '-') # replace spaces with dash - anchor = re.sub(specialchar_rx, '', anchor) # remove misc special chars - anchor = quote(anchor) # url encode - return anchor - -def get_toc_index(lines): - toc_index = None - for i, line in enumerate(lines): - if line.rstrip() in valid_toc_headings: - toc_index = i - break - return toc_index - -def get_toc_items(lines, toc_index): - for i, line in enumerate(lines): - if i <= toc_index: - continue - if line.startswith('##'): - name = line.lstrip('#') - level = len(line) - len(name) - len('##') - name = name.strip() - anchor = name_to_anchor(name) - yield TocItem(name, anchor, level) - -def toc_string(toc_items): - lines = [f'## {toc_name}', ''] - for name, anchor, level in toc_items: - padding = ' ' * level - if re.match(numbered_heading_rx, name): - bullet, name = name.split('.', 1) - bullet += '.' - name = name.lstrip() - else: - bullet = '-' - lines.append(f'{padding}{bullet} [{name}](#{anchor})') - return '\n'.join(lines) + '\n' - -def add_toc(filename): - with open(filename, 'r', encoding='utf-8') as file: - lines = file.readlines() - toc_index = get_toc_index(lines) - if toc_index is None: - return None # no TOC heading - toc_items = list(get_toc_items(lines, toc_index)) - if not toc_items: - return False # no content headings - with open(filename, 'w', encoding='utf-8') as file: - for i, line in enumerate(lines): - if i == toc_index: - file.write(toc_string(toc_items)) - else: - file.write(line) - return True # OK - -def main(): - if len(sys.argv) < 2: - print(f'Usage: {sys.argv[0]} file.md', file=sys.stderr) - sys.exit(1) - for filename in sys.argv[1:]: - print(filename) - result = add_toc(filename) - if result is None: - print('Warning: No "## TOC" heading found', file=sys.stderr) - elif result is False: - print('Warning: No content headings found', file=sys.stderr) - else: - print('OK') - -if __name__ == '__main__': - main() diff --git a/tools/unique.py b/tools/unique.py deleted file mode 100755 index 34530a3e0e3..00000000000 --- a/tools/unique.py +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -Usage: python unique.py [-f|--flip] [-x|--cross] image.png - -Erase duplicate tiles from an input image. --f or --flip counts X/Y mirrored tiles as duplicates. --x or --cross erases with a cross instead of a blank tile. -""" - -import sys - -import png - -def rgb5_pixels(row): - yield from (tuple(c // 8 for c in row[x:x+3]) for x in range(0, len(row), 4)) - -def rgb8_pixels(row): - yield from (c * 8 + c // 4 for pixel in row for c in pixel) - -def gray_pixels(row): - yield from (pixel[0] // 10 for pixel in row) - -def rows_to_tiles(rows, width, height): - assert len(rows) == height and len(rows[0]) == width - yield from (tuple(tuple(row[x:x+8]) for row in rows[y:y+8]) - for y in range(0, height, 8) for x in range(0, width, 8)) - -def tiles_to_rows(tiles, width, height): - assert width % 8 == 0 and height % 8 == 0 - width, height = width // 8, height // 8 - tiles = list(tiles) - assert len(tiles) == width * height - tile_rows = (tiles[y:y+width] for y in range(0, width * height, width)) - yield from ([tile[y][x] for tile in tile_row for x in range(8)] - for tile_row in tile_rows for y in range(8)) - -def tile_variants(tile, flip): - yield tile - if flip: - yield tile[::-1] - yield tuple(row[::-1] for row in tile) - yield tuple(row[::-1] for row in tile[::-1]) - -def unique_tiles(tiles, flip, cross): - if cross: - blank = [[(0, 0, 0)] * 8 for _ in range(8)] - for y in range(8): - blank[y][y] = blank[y][7 - y] = (31, 31, 31) - blank = tuple(tuple(row) for row in blank) - else: - blank = tuple(tuple([(31, 31, 31)] * 8) for _ in range(8)) - seen = set() - for tile in tiles: - if any(variant in seen for variant in tile_variants(tile, flip)): - yield blank - else: - yield tile - seen.add(tile) - -def is_grayscale(colors): - return (colors.issubset({(31, 31, 31), (21, 21, 21), (10, 10, 10), (0, 0, 0)}) or - colors.issubset({(31, 31, 31), (20, 20, 20), (10, 10, 10), (0, 0, 0)})) - -def erase_duplicates(filename, flip, cross): - with open(filename, 'rb') as file: - width, height, rows = png.Reader(file).asRGBA8()[:3] - rows = [list(rgb5_pixels(row)) for row in rows] - if width % 8 or height % 8: - return False - tiles = unique_tiles(rows_to_tiles(rows, width, height), flip, cross) - rows = list(tiles_to_rows(tiles, width, height)) - if is_grayscale({c for row in rows for c in row}): - rows = [list(gray_pixels(row)) for row in rows] - writer = png.Writer(width, height, greyscale=True, bitdepth=2, compression=9) - else: - rows = [list(rgb8_pixels(row)) for row in rows] - writer = png.Writer(width, height, greyscale=False, bitdepth=8, compression=9) - with open(filename, 'wb') as file: - writer.write(file, rows) - return True - -def main(): - flip = cross = False - while True: - if len(sys.argv) < 2: - print(f'Usage: {sys.argv[0]} [-f|--flip] [-x|--cross] tileset.png', file=sys.stderr) - sys.exit(1) - elif sys.argv[1] in {'-f', '--flip'}: - flip = True - elif sys.argv[1] in {'-x', '--cross'}: - cross = True - elif sys.argv[1] in {'-fx', '-xf'}: - flip = cross = True - else: - break - sys.argv.pop(1) - for filename in sys.argv[1:]: - if not filename.lower().endswith('.png'): - print(f'{filename} is not a .png file!', file=sys.stderr) - elif not erase_duplicates(filename, flip, cross): - print(f'{filename} is not divisible into 8x8 tiles!', file=sys.stderr) - -if __name__ == '__main__': - main()