diff options
author | Sebastian Rasmussen <sebras@gmail.com> | 2018-05-26 14:51:42 +0800 |
---|---|---|
committer | Sebastian Rasmussen <sebras@gmail.com> | 2018-07-13 16:54:30 +0800 |
commit | 8f4288807d659f72734d41dd8b7d434b1e15dfc2 (patch) | |
tree | ade73599553c0fd5760f02c9c1796e65bad0afb7 /jbig2dec | |
parent | 55925ee6220fe371b1fe34fdc27cfd4dad8847b2 (diff) | |
download | ghostpdl-8f4288807d659f72734d41dd8b7d434b1e15dfc2.tar.gz |
jbig2dec: Create jbig2_page.h with page declarations.
Diffstat (limited to 'jbig2dec')
-rw-r--r-- | jbig2dec/jbig2.c | 1 | ||||
-rw-r--r-- | jbig2dec/jbig2_generic.c | 1 | ||||
-rw-r--r-- | jbig2dec/jbig2_halftone.c | 1 | ||||
-rw-r--r-- | jbig2dec/jbig2_page.c | 1 | ||||
-rw-r--r-- | jbig2dec/jbig2_page.h | 53 | ||||
-rw-r--r-- | jbig2dec/jbig2_priv.h | 30 | ||||
-rw-r--r-- | jbig2dec/jbig2_refinement.c | 1 | ||||
-rw-r--r-- | jbig2dec/jbig2_segment.c | 1 | ||||
-rw-r--r-- | jbig2dec/jbig2_text.c | 1 |
9 files changed, 60 insertions, 30 deletions
diff --git a/jbig2dec/jbig2.c b/jbig2dec/jbig2.c index cdb49cd3b..ef6d20f87 100644 --- a/jbig2dec/jbig2.c +++ b/jbig2dec/jbig2.c @@ -29,6 +29,7 @@ #include "jbig2.h" #include "jbig2_priv.h" +#include "jbig2_page.h" static void * jbig2_default_alloc(Jbig2Allocator *allocator, size_t size) diff --git a/jbig2dec/jbig2_generic.c b/jbig2dec/jbig2_generic.c index be185616a..eda5bf755 100644 --- a/jbig2dec/jbig2_generic.c +++ b/jbig2dec/jbig2_generic.c @@ -39,6 +39,7 @@ #include "jbig2_arith.h" #include "jbig2_generic.h" #include "jbig2_mmr.h" +#include "jbig2_page.h" /* return the appropriate context size for the given template */ int diff --git a/jbig2dec/jbig2_halftone.c b/jbig2dec/jbig2_halftone.c index ccb8b48de..a737457a2 100644 --- a/jbig2dec/jbig2_halftone.c +++ b/jbig2dec/jbig2_halftone.c @@ -33,6 +33,7 @@ #include "jbig2_mmr.h" #include "jbig2_image.h" #include "jbig2_halftone.h" +#include "jbig2_page.h" /** * jbig2_hd_new: create a new dictionary from a collective bitmap diff --git a/jbig2dec/jbig2_page.c b/jbig2dec/jbig2_page.c index 43e17c945..93fd44129 100644 --- a/jbig2dec/jbig2_page.c +++ b/jbig2dec/jbig2_page.c @@ -26,6 +26,7 @@ #include "jbig2.h" #include "jbig2_priv.h" +#include "jbig2_page.h" #ifdef OUTPUT_PBM #include <stdio.h> diff --git a/jbig2dec/jbig2_page.h b/jbig2dec/jbig2_page.h new file mode 100644 index 000000000..316824f04 --- /dev/null +++ b/jbig2dec/jbig2_page.h @@ -0,0 +1,53 @@ +/* Copyright (C) 2001-2018 Artifex Software, Inc. + All Rights Reserved. + + This software is provided AS-IS with no warranty, either express or + implied. + + This software is distributed under license and may not be copied, + modified or distributed except as expressly authorized under the terms + of the license contained in the file LICENSE in this distribution. + + Refer to licensing information at http://www.artifex.com or contact + Artifex Software, Inc., 1305 Grant Avenue - Suite 200, Novato, + CA 94945, U.S.A., +1(415)492-9861, for further information. +*/ + +/* + jbig2dec +*/ + +#ifndef _JBIG2_PAGE_H +#define _JBIG2_PAGE_H + +/* the page structure handles decoded page + results. it's allocated by a 'page info' + segment and marked complete by an 'end of page' + segment. +*/ +typedef enum { + JBIG2_PAGE_FREE, + JBIG2_PAGE_NEW, + JBIG2_PAGE_COMPLETE, + JBIG2_PAGE_RETURNED, + JBIG2_PAGE_RELEASED +} Jbig2PageState; + +struct _Jbig2Page { + Jbig2PageState state; + uint32_t number; + uint32_t height, width; /* in pixels */ + uint32_t x_resolution, y_resolution; /* in pixels per meter */ + uint16_t stripe_size; + bool striped; + uint32_t end_row; + uint8_t flags; + Jbig2Image *image; +}; + +int jbig2_page_info(Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segment_data); +int jbig2_end_of_stripe(Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segment_data); +int jbig2_end_of_page(Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segment_data); +int jbig2_page_add_result(Jbig2Ctx *ctx, Jbig2Page *page, Jbig2Image *src, int x, int y, Jbig2ComposeOp op); + +#endif /* _JBIG2_PAGE_H */ diff --git a/jbig2dec/jbig2_priv.h b/jbig2dec/jbig2_priv.h index 4217f5ae8..a3809f1ec 100644 --- a/jbig2dec/jbig2_priv.h +++ b/jbig2dec/jbig2_priv.h @@ -115,35 +115,6 @@ void *jbig2_realloc(Jbig2Allocator *allocator, void *p, size_t size, size_t num) int jbig2_error(Jbig2Ctx *ctx, Jbig2Severity severity, int32_t seg_idx, const char *fmt, ...); -/* the page structure handles decoded page - results. it's allocated by a 'page info' - segment and marked complete by an 'end of page' - segment. -*/ -typedef enum { - JBIG2_PAGE_FREE, - JBIG2_PAGE_NEW, - JBIG2_PAGE_COMPLETE, - JBIG2_PAGE_RETURNED, - JBIG2_PAGE_RELEASED -} Jbig2PageState; - -struct _Jbig2Page { - Jbig2PageState state; - uint32_t number; - uint32_t height, width; /* in pixels */ - uint32_t x_resolution, y_resolution; /* in pixels per meter */ - uint16_t stripe_size; - bool striped; - uint32_t end_row; - uint8_t flags; - Jbig2Image *image; -}; - -int jbig2_page_info(Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segment_data); -int jbig2_end_of_stripe(Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segment_data); -int jbig2_end_of_page(Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segment_data); - typedef enum { JBIG2_COMPOSE_OR = 0, JBIG2_COMPOSE_AND = 1, @@ -153,7 +124,6 @@ typedef enum { } Jbig2ComposeOp; int jbig2_image_compose(Jbig2Ctx *ctx, Jbig2Image *dst, Jbig2Image *src, int x, int y, Jbig2ComposeOp op); -int jbig2_page_add_result(Jbig2Ctx *ctx, Jbig2Page *page, Jbig2Image *src, int x, int y, Jbig2ComposeOp op); /* region segment info */ diff --git a/jbig2dec/jbig2_refinement.c b/jbig2dec/jbig2_refinement.c index b05c6dff1..0c6b793e8 100644 --- a/jbig2dec/jbig2_refinement.c +++ b/jbig2dec/jbig2_refinement.c @@ -36,6 +36,7 @@ #include "jbig2_arith.h" #include "jbig2_generic.h" #include "jbig2_image.h" +#include "jbig2_page.h" static int jbig2_decode_refinement_template0_unopt(Jbig2Ctx *ctx, diff --git a/jbig2dec/jbig2_segment.c b/jbig2dec/jbig2_segment.c index c2e238f96..742967a52 100644 --- a/jbig2dec/jbig2_segment.c +++ b/jbig2dec/jbig2_segment.c @@ -27,6 +27,7 @@ #include "jbig2.h" #include "jbig2_priv.h" #include "jbig2_huffman.h" +#include "jbig2_page.h" #include "jbig2_symbol_dict.h" #include "jbig2_metadata.h" #include "jbig2_arith.h" diff --git a/jbig2dec/jbig2_text.c b/jbig2dec/jbig2_text.c index f545fb738..13372f4d6 100644 --- a/jbig2dec/jbig2_text.c +++ b/jbig2dec/jbig2_text.c @@ -32,6 +32,7 @@ #include "jbig2_arith_iaid.h" #include "jbig2_huffman.h" #include "jbig2_generic.h" +#include "jbig2_page.h" #include "jbig2_symbol_dict.h" #include "jbig2_text.h" |