Remove stray CFX_ from CFX_GifImageInfo Fixed: pdfium:1493 Change-Id: Iba55ca93c7e125ef6fff79ae3056c1f1b9ac0559 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/77511 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: Daniel Hosseinian <dhoss@chromium.org>
diff --git a/core/fxcodec/gif/cfx_gif.cpp b/core/fxcodec/gif/cfx_gif.cpp index efe4f4b..40f99b6 100644 --- a/core/fxcodec/gif/cfx_gif.cpp +++ b/core/fxcodec/gif/cfx_gif.cpp
@@ -17,8 +17,8 @@ "CFX_GifHeader should have a size of 6"); static_assert(sizeof(CFX_GifLocalScreenDescriptor) == 7, "CFX_GifLocalScreenDescriptor should have a size of 7"); -static_assert(sizeof(CFX_CFX_GifImageInfo) == 9, - "CFX_CFX_GifImageInfo should have a size of 9"); +static_assert(sizeof(CFX_GifImageInfo) == 9, + "CFX_GifImageInfo should have a size of 9"); static_assert(sizeof(CFX_GifControlExtensionFlags) == 1, "CFX_GifControlExtensionFlags should have a size of 1"); static_assert(sizeof(CFX_GifPlainTextExtension) == 13,
diff --git a/core/fxcodec/gif/cfx_gif.h b/core/fxcodec/gif/cfx_gif.h index 497f400..3565c7b 100644 --- a/core/fxcodec/gif/cfx_gif.h +++ b/core/fxcodec/gif/cfx_gif.h
@@ -64,7 +64,7 @@ uint8_t pixel_aspect; }; -struct CFX_CFX_GifImageInfo { +struct CFX_GifImageInfo { uint16_t left; uint16_t top; uint16_t width; @@ -125,7 +125,7 @@ std::unique_ptr<CFX_GifGraphicControlExtension> image_GCE; std::vector<CFX_GifPalette> local_palettes; std::vector<uint8_t, FxAllocAllocator<uint8_t>> row_buffer; - CFX_CFX_GifImageInfo image_info; + CFX_GifImageInfo image_info; uint8_t local_palette_exp; uint8_t code_exp; uint32_t data_pos;
diff --git a/core/fxcodec/gif/cfx_gifcontext.cpp b/core/fxcodec/gif/cfx_gifcontext.cpp index 0003b55..0022a2c 100644 --- a/core/fxcodec/gif/cfx_gifcontext.cpp +++ b/core/fxcodec/gif/cfx_gifcontext.cpp
@@ -461,7 +461,7 @@ return CFX_GifDecodeStatus::Error; size_t read_marker = input_buffer_->GetPosition(); - CFX_CFX_GifImageInfo img_info; + CFX_GifImageInfo img_info; if (!ReadAllOrNone(reinterpret_cast<uint8_t*>(&img_info), sizeof(img_info))) return CFX_GifDecodeStatus::Unfinished;