mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-09-02 21:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename FrameTags -> Tags in file spec/encoder/decoder functions

Browse Source
This commit is contained in:
David Capello 2019-10-01 13:16:35 -03:00
parent cefeb9cbc0
commit 4e4cafece6
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/ase-file-specs.md
View File

@ -247,7 +247,7 @@ Color profile for RGB or grayscale values.
Never used.
### Frame Tags Chunk (0x2018)
### Tags Chunk (0x2018)
WORD Number of tags
BYTE[8] For future (set to zero)

16
src/app/file/ase_format.cpp
View File

@ -120,8 +120,8 @@ static void ase_file_write_color_profile(FILE* f,
#if 0
static void ase_file_write_mask_chunk(FILE* f, dio::AsepriteFrameHeader* frame_header, Mask* mask);
#endif
static void ase_file_write_frame_tags_chunk(FILE* f, dio::AsepriteFrameHeader* frame_header, const FrameTags* frameTags,
const frame_t fromFrame, const frame_t toFrame);
static void ase_file_write_tags_chunk(FILE* f, dio::AsepriteFrameHeader* frame_header, const FrameTags* frameTags,
const frame_t fromFrame, const frame_t toFrame);
static void ase_file_write_slice_chunks(FILE* f, dio::AsepriteFrameHeader* frame_header, const Slices& slices,
const frame_t fromFrame, const frame_t toFrame);
static void ase_file_write_slice_chunk(FILE* f, dio::AsepriteFrameHeader* frame_header, Slice* slice,
@ -305,9 +305,9 @@ bool AseFormat::onSave(FileOp* fop)
// Writer frame tags
if (sprite->frameTags().size() > 0)
ase_file_write_frame_tags_chunk(f, &frame_header, &sprite->frameTags(),
fop->roi().fromFrame(),
fop->roi().toFrame());
ase_file_write_tags_chunk(f, &frame_header, &sprite->frameTags(),
fop->roi().fromFrame(),
fop->roi().toFrame());
// Writer slice chunks
ase_file_write_slice_chunks(f, &frame_header,
@ -921,10 +921,10 @@ static void ase_file_write_mask_chunk(FILE* f, dio::AsepriteFrameHeader* frame_h
}
#endif
static void ase_file_write_frame_tags_chunk(FILE* f, dio::AsepriteFrameHeader* frame_header, const FrameTags* frameTags,
const frame_t fromFrame, const frame_t toFrame)
static void ase_file_write_tags_chunk(FILE* f, dio::AsepriteFrameHeader* frame_header, const FrameTags* frameTags,
const frame_t fromFrame, const frame_t toFrame)
{
ChunkWriter chunk(f, frame_header, ASE_FILE_CHUNK_FRAME_TAGS);
ChunkWriter chunk(f, frame_header, ASE_FILE_CHUNK_TAGS);
int tags = 0;
for (const FrameTag* tag : *frameTags) {

2
src/dio/aseprite_common.h
View File

@ -22,7 +22,7 @@
#define ASE_FILE_CHUNK_COLOR_PROFILE 0x2007
#define ASE_FILE_CHUNK_MASK 0x2016
#define ASE_FILE_CHUNK_PATH 0x2017
#define ASE_FILE_CHUNK_FRAME_TAGS 0x2018
#define ASE_FILE_CHUNK_TAGS 0x2018
#define ASE_FILE_CHUNK_PALETTE 0x2019
#define ASE_FILE_CHUNK_USER_DATA 0x2020
#define ASE_FILE_CHUNK_SLICES 0x2021 // Deprecated chunk (used on dev versions only between v1.2-beta7 and v1.2-beta8)

6
src/dio/aseprite_decoder.cpp
View File

@ -172,8 +172,8 @@ bool AsepriteDecoder::decode()
// Ignore
break;
case ASE_FILE_CHUNK_FRAME_TAGS:
readFrameTagsChunk(&sprite->frameTags());
case ASE_FILE_CHUNK_TAGS:
readTagsChunk(&sprite->frameTags());
break;
case ASE_FILE_CHUNK_SLICES: {
@ -809,7 +809,7 @@ doc::Mask* AsepriteDecoder::readMaskChunk()
return mask;
}
void AsepriteDecoder::readFrameTagsChunk(doc::FrameTags* frameTags)
void AsepriteDecoder::readTagsChunk(doc::FrameTags* frameTags)
{
size_t tags = read16();

2
src/dio/aseprite_decoder.h
View File

@ -55,7 +55,7 @@ private:
void readCelExtraChunk(doc::Cel* cel);
void readColorProfile(doc::Sprite* sprite);
doc::Mask* readMaskChunk();
void readFrameTagsChunk(doc::FrameTags* frameTags);
void readTagsChunk(doc::FrameTags* frameTags);
void readSlicesChunk(doc::Slices& slices);
doc::Slice* readSliceChunk(doc::Slices& slices);
void readUserDataChunk(doc::UserData* userData);