ICB: Use jpeg from common image
This commit is contained in:
Paweł Kołodziejski
parent
c2ffa13cce
commit
240156dfca
4 changed files with 20 additions and 1727 deletions
1311
engines/icb/jpeg.cpp
1311
engines/icb/jpeg.cpp
File diff suppressed because it is too large
Load diff
|
|
@ -1,412 +0,0 @@
|
||||||
/* ResidualVM - A 3D game interpreter
|
|
||||||
*
|
|
||||||
* ResidualVM is the legal property of its developers, whose names
|
|
||||||
* are too numerous to list here. Please refer to the AUTHORS
|
|
||||||
* file distributed with this source distribution.
|
|
||||||
*
|
|
||||||
* Additional copyright for this file:
|
|
||||||
* Copyright (C) 1999-2000 Revolution Software Ltd.
|
|
||||||
* This code is based on source code created by Revolution Software,
|
|
||||||
* used with permission.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU General Public License
|
|
||||||
* as published by the Free Software Foundation; either version 2
|
|
||||||
* of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ICB_JPEG_H
|
|
||||||
#define ICB_JPEG_H
|
|
||||||
|
|
||||||
#include "engines/icb/common/px_common.h"
|
|
||||||
|
|
||||||
namespace ICB {
|
|
||||||
|
|
||||||
class _surface;
|
|
||||||
|
|
||||||
const int32 JpegMaxHuffmanTables = 4;
|
|
||||||
const int32 MaxQuantizationTables = 4;
|
|
||||||
const int32 JpegMaxComponentsPerFrame = 255;
|
|
||||||
const int32 JpegMaxComponentsPerScan = 4;
|
|
||||||
const int32 JpegMinSamplingFrequency = 1;
|
|
||||||
const int32 JpegMaxSamplingFrequency = 4;
|
|
||||||
const int32 JpegSampleWidth = 8;
|
|
||||||
const int32 JpegSampleSize = JpegSampleWidth * JpegSampleWidth;
|
|
||||||
const int32 JpegMinSampleValue = 0;
|
|
||||||
const int32 JpegMaxSampleValue = 255; // For 12-Bits this would be 4095
|
|
||||||
const int32 JpegMidpointSampleValue = 128; // For 12-Bits this 2048
|
|
||||||
const int32 JpegMaxDataUnitsPerMCU = 10;
|
|
||||||
const int32 JpegMaxSuccessiveApproximation = 13;
|
|
||||||
const int32 JpegMax8BitQuantizationValue = 255;
|
|
||||||
const int32 JpegMinQuantizationValue = 1;
|
|
||||||
const uint32 JpegMaxHuffmanCodeLength = 16;
|
|
||||||
const uint32 JpegMaxNumberOfHuffmanCodes = 256;
|
|
||||||
extern const uint32 JpegZigZagInputOrderCodes[JpegSampleSize];
|
|
||||||
extern const uint32 JpegZigZagOutputOrderCodes[JpegSampleSize];
|
|
||||||
typedef int16 JpegDecoderCoefficientBlock[JpegSampleWidth][JpegSampleWidth];
|
|
||||||
|
|
||||||
// These definitions do not include the preceding 0xFF byte.
|
|
||||||
enum JpegMarkers {
|
|
||||||
// Start of Frame Markers, Non-Differential Huffman Coding
|
|
||||||
SOF0 = 0xC0, // Baseline DCT
|
|
||||||
SOF1 = 0xC1, // Sequential DCT
|
|
||||||
SOF2 = 0xC2, // Progressive DCT
|
|
||||||
SOF3 = 0xC3, // Spatial (sequential) lossless
|
|
||||||
// Start of Frame Markers, Differential Huffman Coding
|
|
||||||
SOF5 = 0xC5, // Differential Sequential DCT
|
|
||||||
SOF6 = 0xC6, // Differential Progressive DCT
|
|
||||||
SOF7 = 0xC7, // Differential Spatial
|
|
||||||
// Start of Frame Markers, Non-Differential Arithmetic Coding
|
|
||||||
SOF9 = 0xC9, // Extended Sequential DCT
|
|
||||||
SOFA = 0xCA, // Progressive DCT
|
|
||||||
SOFB = 0xCB, // Spacial (sequential) Lossless
|
|
||||||
// Start of Frame Markers, Differential Arithmetic Coding
|
|
||||||
SOFD = 0xCD, // Differential Sequential DCT
|
|
||||||
SOFE = 0xCE, // Differential Progressive DCT
|
|
||||||
SOFF = 0xCF, // Differential Spatial
|
|
||||||
// Other Markers
|
|
||||||
DHT = 0xC4, // Define Huffman Tables
|
|
||||||
DAC = 0xCC, // Define Arithmetic Coding Conditions
|
|
||||||
RST0 = 0xD0, // Restart Marker
|
|
||||||
RST1 = 0xD1, // Restart Marker
|
|
||||||
RST2 = 0xD2, // Restart Marker
|
|
||||||
RST3 = 0xD3, // Restart Marker
|
|
||||||
RST4 = 0xD4, // Restart Marker
|
|
||||||
RST5 = 0xD5, // Restart Marker
|
|
||||||
RST6 = 0xD6, // Restart Marker
|
|
||||||
RST7 = 0xD7, // Restart Marker
|
|
||||||
SOI = 0xD8, // Start of Image
|
|
||||||
EOI = 0xD9, // End of Image
|
|
||||||
SOS = 0xDA, // Start of Scan
|
|
||||||
DQT = 0xDB, // Define Quantization Table
|
|
||||||
DNL = 0xDC, // Define Number of Lines
|
|
||||||
DRI = 0xDD, // Define Restart Intervale
|
|
||||||
DHP = 0xDE, // Define Hierarchical Progression
|
|
||||||
EXP = 0xDF, // Expand Reference Components
|
|
||||||
APP0 = 0xE0, // Application Segments
|
|
||||||
APP1 = 0xE1, // Application Segments
|
|
||||||
APP2 = 0xE2, // Application Segments
|
|
||||||
APP3 = 0xE3, // Application Segments
|
|
||||||
APP4 = 0xE4, // Application Segments
|
|
||||||
APP5 = 0xE5, // Application Segments
|
|
||||||
APP6 = 0xE6, // Application Segments
|
|
||||||
APP7 = 0xE7, // Application Segments
|
|
||||||
APP8 = 0xE8, // Application Segments
|
|
||||||
APP9 = 0xE9, // Application Segments
|
|
||||||
APPA = 0xEA, // Application Segments
|
|
||||||
APPB = 0xEB, // Application Segments
|
|
||||||
APPC = 0xEC, // Application Segments
|
|
||||||
APPD = 0xED, // Application Segments
|
|
||||||
APPE = 0xEE, // Application Segments
|
|
||||||
APPF = 0xEF, // Application Segments
|
|
||||||
// C8, F0-FD, 01, 02-BF reserved
|
|
||||||
COM = 0xFE, // Comment
|
|
||||||
SOB = 0xFF // Start of Block - Byte that precedes all others - not in the standard.
|
|
||||||
};
|
|
||||||
|
|
||||||
// To implement 12-bit data the return values would have to be
|
|
||||||
// at least 12 bits wide.
|
|
||||||
|
|
||||||
// Functions for YCbCr/RGB colorspace conversion
|
|
||||||
#define JPEGSAMPLE_SCALEFACTOR 12
|
|
||||||
#define JPEGSAMPLE_ROUNDING 2048
|
|
||||||
#define JPEGSAMPLE_RED_CONST 5743
|
|
||||||
#define JPEGSAMPLE_GREEN_CONST1 1410
|
|
||||||
#define JPEGSAMPLE_GREEN_CONST2 2925
|
|
||||||
#define JPEGSAMPLE_BLUE_CONST 7258
|
|
||||||
|
|
||||||
inline void YCbCr_To_RGB(int32 yy, int32 cb, int32 cr, uint8 &r, uint8 &g, uint8 &b) {
|
|
||||||
int32 mcr = cr - JpegMidpointSampleValue;
|
|
||||||
int32 mcb = cb - JpegMidpointSampleValue;
|
|
||||||
|
|
||||||
int32 a = yy + ((JPEGSAMPLE_RED_CONST * mcr + JPEGSAMPLE_ROUNDING) >> JPEGSAMPLE_SCALEFACTOR);
|
|
||||||
r = (uint8)((a < 0) ? 0 : (a > 255) ? 255 : a);
|
|
||||||
|
|
||||||
a = yy - ((JPEGSAMPLE_GREEN_CONST1 * mcb + JPEGSAMPLE_GREEN_CONST2 * mcr + JPEGSAMPLE_ROUNDING) >> JPEGSAMPLE_SCALEFACTOR);
|
|
||||||
g = (uint8)((a < 0) ? 0 : (a > 255) ? 255 : a);
|
|
||||||
|
|
||||||
a = yy + ((JPEGSAMPLE_BLUE_CONST * mcb + JPEGSAMPLE_ROUNDING) >> JPEGSAMPLE_SCALEFACTOR);
|
|
||||||
b = (uint8)((a < 0) ? 0 : (a > 255) ? 255 : a);
|
|
||||||
}
|
|
||||||
|
|
||||||
// JPEG Decoder Class Implementation - JPEG Decoder Class Implementation -
|
|
||||||
class JpegDecoderComponent;
|
|
||||||
class JpegHuffmanDecoder;
|
|
||||||
class JpegDecoderQuantizationTable;
|
|
||||||
|
|
||||||
class JpegDecoder {
|
|
||||||
public:
|
|
||||||
JpegDecoder();
|
|
||||||
virtual ~JpegDecoder();
|
|
||||||
|
|
||||||
virtual void ReadImage(uint8 *inputData, uint32 surface_Id);
|
|
||||||
virtual void UpdateImage();
|
|
||||||
|
|
||||||
int32 cGetBit();
|
|
||||||
|
|
||||||
inline uint8 ReadByte() {
|
|
||||||
uint8 value = input_buffer[iPos];
|
|
||||||
iPos += sizeof(uint8);
|
|
||||||
bit_position = 0;
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline uint16 ReadWord() {
|
|
||||||
bit_position = 0;
|
|
||||||
uint16 value = *((uint16 *)(&input_buffer[iPos]));
|
|
||||||
iPos += sizeof(uint16);
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
int32 NextBit();
|
|
||||||
int32 Receive(uint32 count);
|
|
||||||
|
|
||||||
void Initialize();
|
|
||||||
void ReadStreamHeader();
|
|
||||||
void ReadMarker();
|
|
||||||
void ReadApplication(uint8 type);
|
|
||||||
void ReadHuffmanTable();
|
|
||||||
void ReadQuantization();
|
|
||||||
void ReadStartOfFrame(uint8 type);
|
|
||||||
void ReadStartOfScan();
|
|
||||||
void CalculateMcuDimensions();
|
|
||||||
void FreeAllocatedResources();
|
|
||||||
void ReadSequentialNonInterleavedScan();
|
|
||||||
void ResetDcDifferences();
|
|
||||||
void RefineAcCoefficient(int16 &value, uint32 ssa);
|
|
||||||
|
|
||||||
// Huffman tables
|
|
||||||
JpegHuffmanDecoder *ac_tables;
|
|
||||||
JpegHuffmanDecoder *dc_tables;
|
|
||||||
|
|
||||||
// Quantization tables
|
|
||||||
JpegDecoderQuantizationTable *quantization_tables;
|
|
||||||
|
|
||||||
// Bit I/O state
|
|
||||||
int32 bit_position; // Called CNT in Section F.2.2.5
|
|
||||||
uint8 bit_data; // Called B in Section F.2.2.5
|
|
||||||
|
|
||||||
bool eoi_found;
|
|
||||||
bool sof_found;
|
|
||||||
|
|
||||||
uint8 *input_buffer;
|
|
||||||
uint32 iPos;
|
|
||||||
uint32 surfaceId;
|
|
||||||
|
|
||||||
uint32 frame_type;
|
|
||||||
|
|
||||||
uint32 max_horizontal_frequency;
|
|
||||||
uint32 max_vertical_frequency;
|
|
||||||
|
|
||||||
uint32 component_count;
|
|
||||||
JpegDecoderComponent *components;
|
|
||||||
uint32 *component_indices;
|
|
||||||
|
|
||||||
// Progress Counters
|
|
||||||
uint32 current_scan;
|
|
||||||
uint32 scan_count;
|
|
||||||
|
|
||||||
uint32 mcu_rows;
|
|
||||||
uint32 mcu_cols;
|
|
||||||
|
|
||||||
uint32 mcu_height;
|
|
||||||
uint32 mcu_width;
|
|
||||||
|
|
||||||
uint32 scan_component_count;
|
|
||||||
JpegDecoderComponent **scan_components;
|
|
||||||
|
|
||||||
friend class JpegDecoderQuantizationTable;
|
|
||||||
friend class JpegHuffmanDecoder;
|
|
||||||
friend class JpegDecoderComponent;
|
|
||||||
};
|
|
||||||
|
|
||||||
// JPEG Decoder Huffman Table Class Implementation
|
|
||||||
//
|
|
||||||
// This class represents a Huffman Table used by the JpegDecoder
|
|
||||||
// class.
|
|
||||||
//
|
|
||||||
class JpegHuffmanDecoder {
|
|
||||||
public:
|
|
||||||
JpegHuffmanDecoder();
|
|
||||||
virtual ~JpegHuffmanDecoder() {}
|
|
||||||
|
|
||||||
// This function reads a Huffman table from the input stream.
|
|
||||||
uint32 ReadTable(JpegDecoder &);
|
|
||||||
|
|
||||||
// Function to decode the next value in the input stream.
|
|
||||||
int32 Decode(JpegDecoder &);
|
|
||||||
|
|
||||||
// This function builds the structures needed for Huffman
|
|
||||||
// decoding after the table data has been read.
|
|
||||||
void MakeTable(uint8 huffbits[JpegMaxHuffmanCodeLength]);
|
|
||||||
|
|
||||||
// Maximum Huffman code value of length N
|
|
||||||
int32 maxcode[JpegMaxHuffmanCodeLength];
|
|
||||||
// Minimum Huffman code value of length N
|
|
||||||
int32 mincode[JpegMaxHuffmanCodeLength];
|
|
||||||
// Index into "values" for minimum code of length N
|
|
||||||
uint8 valptr[JpegMaxHuffmanCodeLength];
|
|
||||||
// Huffman values
|
|
||||||
uint8 huff_values[JpegMaxNumberOfHuffmanCodes];
|
|
||||||
};
|
|
||||||
|
|
||||||
// Title: JPEG Decoder Quantization Table Class Implementation
|
|
||||||
class JpegDecoderQuantizationTable {
|
|
||||||
public:
|
|
||||||
JpegDecoderQuantizationTable();
|
|
||||||
~JpegDecoderQuantizationTable() {}
|
|
||||||
|
|
||||||
// Function to read the quantization table from the input stream.
|
|
||||||
void ReadTable(JpegDecoder &decoder, uint32 precision);
|
|
||||||
|
|
||||||
// This function builds the scaled quantization tables used in
|
|
||||||
// fast IDCT implementations.
|
|
||||||
void BuildScaledTables();
|
|
||||||
|
|
||||||
// Quantization Values in Zig-Zag Order.
|
|
||||||
uint16 data_values[JpegSampleSize];
|
|
||||||
|
|
||||||
// Scaling factor used for the scaled integer values.
|
|
||||||
enum { QuantizationIntegerScale = 12 };
|
|
||||||
|
|
||||||
// Scaled quantization values used for the fast IDCT implementations.
|
|
||||||
double float_scaling[JpegSampleWidth][JpegSampleWidth];
|
|
||||||
int32 integer_scaling[JpegSampleWidth][JpegSampleWidth];
|
|
||||||
};
|
|
||||||
|
|
||||||
// Title: JPEG Definitions and Utility Functions
|
|
||||||
//
|
|
||||||
// Decoder Data Unit Class Definition
|
|
||||||
//
|
|
||||||
// Descrition:
|
|
||||||
//
|
|
||||||
// The DataUnit class represents an 8x8 sample block for one
|
|
||||||
// component of the JPEG image.
|
|
||||||
//
|
|
||||||
//
|
|
||||||
class JpegDecoderDataUnit {
|
|
||||||
public:
|
|
||||||
// Declaration of a type for pointers to member functions
|
|
||||||
// for implementing the IDCT. The input parameters are
|
|
||||||
// The IDCT coefficients and the [de]quantization table.
|
|
||||||
typedef JpegDecoderDataUnit &(JpegDecoderDataUnit::*IDctFunction)(JpegDecoderCoefficientBlock, const JpegDecoderQuantizationTable &);
|
|
||||||
|
|
||||||
JpegDecoderDataUnit() {}
|
|
||||||
virtual ~JpegDecoderDataUnit() {}
|
|
||||||
|
|
||||||
// General IDCT Function
|
|
||||||
JpegDecoderDataUnit &InverseDCT(JpegDecoderCoefficientBlock cb, const JpegDecoderQuantizationTable &qt);
|
|
||||||
|
|
||||||
// These are the IDCT implementations.
|
|
||||||
JpegDecoderDataUnit &FloatInverseDCT(JpegDecoderCoefficientBlock, const JpegDecoderQuantizationTable &);
|
|
||||||
JpegDecoderDataUnit &IntegerInverseDCT(JpegDecoderCoefficientBlock, const JpegDecoderQuantizationTable &);
|
|
||||||
|
|
||||||
// Operators to retrieve the individual IDCT values.
|
|
||||||
// uint8 const* operator [] (uint32 ii) const;
|
|
||||||
|
|
||||||
// The IDCT values.
|
|
||||||
uint8 values[JpegSampleWidth][JpegSampleWidth];
|
|
||||||
|
|
||||||
// This is a pointer to the member function that implements
|
|
||||||
// the desired IDCT function.
|
|
||||||
static IDctFunction idct_function;
|
|
||||||
};
|
|
||||||
|
|
||||||
inline JpegDecoderDataUnit &JpegDecoderDataUnit::InverseDCT(JpegDecoderCoefficientBlock cb, const JpegDecoderQuantizationTable &qt) { return (this->*idct_function)(cb, qt); }
|
|
||||||
|
|
||||||
//
|
|
||||||
// Description:
|
|
||||||
//
|
|
||||||
// The IDCT process can produce rounding errors that result in sample
|
|
||||||
// values being outside the legal range. This function clamps
|
|
||||||
// sample value into the legal range.
|
|
||||||
//
|
|
||||||
// Unclamped values give strange results when converted to bytes.
|
|
||||||
// -1 (0xFFFFFFFF) would be converted to 255 (0xFF) instead of 0 and
|
|
||||||
// 256 (0x00000100) gets converted to 0.
|
|
||||||
//
|
|
||||||
// Parameters:
|
|
||||||
// value: The value to clamp
|
|
||||||
//
|
|
||||||
// Return Value:
|
|
||||||
// "value" clamped to MinSampleValue..MaxSampleValue
|
|
||||||
//
|
|
||||||
static inline uint8 SampleRange(int32 value) {
|
|
||||||
if (value < JpegMinSampleValue)
|
|
||||||
return (uint8)JpegMinSampleValue;
|
|
||||||
else if (value > JpegMaxSampleValue)
|
|
||||||
return (uint8)JpegMaxSampleValue;
|
|
||||||
else
|
|
||||||
return (uint8)value;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Title: JPEG Definitions and Utility Functions
|
|
||||||
//
|
|
||||||
// This class represents a component within the JPEG decoder.
|
|
||||||
//
|
|
||||||
class JpegDecoderComponent {
|
|
||||||
public:
|
|
||||||
JpegDecoderComponent();
|
|
||||||
~JpegDecoderComponent();
|
|
||||||
|
|
||||||
// We have made the color conversions static because RGB
|
|
||||||
// conversion requires the data from three components.
|
|
||||||
// Grayscale conversion is static strictly for consistency
|
|
||||||
// with RGB.
|
|
||||||
static void RGBConvert(JpegDecoderComponent &c1, JpegDecoderComponent &c2, JpegDecoderComponent &c3, uint32 surfaceId);
|
|
||||||
|
|
||||||
void SetQuantizationTable(JpegDecoderQuantizationTable &table);
|
|
||||||
void AllocateComponentBuffers(const JpegDecoder &decoder);
|
|
||||||
void FreeComponentBuffers();
|
|
||||||
void SetHuffmanTables(JpegHuffmanDecoder &dc, JpegHuffmanDecoder &ac);
|
|
||||||
void Upsample();
|
|
||||||
|
|
||||||
void DecodeSequential(JpegDecoder &decoder, uint32 mcurow, uint32 mcucol);
|
|
||||||
|
|
||||||
void ProgressiveInverseDct();
|
|
||||||
|
|
||||||
// Sampling Frequencies
|
|
||||||
uint32 horizontal_frequency;
|
|
||||||
uint32 vertical_frequency;
|
|
||||||
|
|
||||||
// These values are the numnber of samples to take for each data
|
|
||||||
// point. They come from the sampling frequencies and the maximum
|
|
||||||
// sampling frequencies of all the components in the image.
|
|
||||||
// sampling frequencies of all the components in the image.
|
|
||||||
uint32 v_sampling;
|
|
||||||
uint32 h_sampling;
|
|
||||||
|
|
||||||
// Last encoded DC value.
|
|
||||||
int32 last_dc_value;
|
|
||||||
|
|
||||||
// Entropy tables used by the component.
|
|
||||||
JpegHuffmanDecoder *ac_table;
|
|
||||||
JpegHuffmanDecoder *dc_table;
|
|
||||||
|
|
||||||
// Quantization table used by the component
|
|
||||||
JpegDecoderQuantizationTable *quantization_table;
|
|
||||||
|
|
||||||
// Non-interleaved dimensions.
|
|
||||||
uint32 noninterleaved_rows;
|
|
||||||
uint32 noninterleaved_cols;
|
|
||||||
|
|
||||||
uint32 du_rows;
|
|
||||||
uint32 du_cols;
|
|
||||||
|
|
||||||
JpegDecoderDataUnit *data_units;
|
|
||||||
uint8 *upsample_data;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // End of namespace ICB
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -54,7 +54,6 @@ MODULE_OBJS := \
|
||||||
icon_list_manager.o \
|
icon_list_manager.o \
|
||||||
icon_menu.o \
|
icon_menu.o \
|
||||||
icon_menu_pc.o \
|
icon_menu_pc.o \
|
||||||
jpeg.o \
|
|
||||||
keyboard.o \
|
keyboard.o \
|
||||||
light_pc.o \
|
light_pc.o \
|
||||||
line_of_sight.o \
|
line_of_sight.o \
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,10 @@
|
||||||
|
|
||||||
#define FORBIDDEN_SYMBOL_EXCEPTION_rand
|
#define FORBIDDEN_SYMBOL_EXCEPTION_rand
|
||||||
|
|
||||||
|
#include "common/memstream.h"
|
||||||
|
|
||||||
|
#include "image/jpeg.h"
|
||||||
|
|
||||||
#include "engines/icb/p4_generic.h"
|
#include "engines/icb/p4_generic.h"
|
||||||
#include "engines/icb/set.h"
|
#include "engines/icb/set.h"
|
||||||
#include "engines/icb/global_objects.h"
|
#include "engines/icb/global_objects.h"
|
||||||
|
|
@ -35,7 +39,6 @@
|
||||||
#include "engines/icb/shake.h"
|
#include "engines/icb/shake.h"
|
||||||
#include "engines/icb/res_man.h"
|
#include "engines/icb/res_man.h"
|
||||||
#include "engines/icb/mission.h"
|
#include "engines/icb/mission.h"
|
||||||
#include "engines/icb/jpeg.h"
|
|
||||||
#include "engines/icb/common/px_capri_maths.h"
|
#include "engines/icb/common/px_capri_maths.h"
|
||||||
#include "engines/icb/common/pc_props.h"
|
#include "engines/icb/common/pc_props.h"
|
||||||
#include "engines/icb/sound/direct_sound.h"
|
#include "engines/icb/sound/direct_sound.h"
|
||||||
|
|
@ -703,8 +706,22 @@ void _set::Init_base_bitmap_buffers() {
|
||||||
uint8 *ptr = bgPtr + shadowTable[0];
|
uint8 *ptr = bgPtr + shadowTable[0];
|
||||||
|
|
||||||
// Decode the jpeg background
|
// Decode the jpeg background
|
||||||
JpegDecoder decoder;
|
Image::JPEGDecoder decoder;
|
||||||
decoder.ReadImage(ptr, bg_buffer_id);
|
decoder.setOutputPixelFormat(Graphics::PixelFormat(4, 8, 8, 8, 8, 16, 8, 0, 24));
|
||||||
|
Common::SeekableReadStream *jpegStream = dynamic_cast<Common::SeekableReadStream *>(new Common::MemoryReadStream(ptr, 1024 * 1024, DisposeAfterUse::YES));
|
||||||
|
decoder.loadStream(*jpegStream);
|
||||||
|
const Graphics::Surface *jpegSurf = decoder.getSurface();
|
||||||
|
int16 pitch = surface_manager->Get_pitch(bg_buffer_id);
|
||||||
|
uint32 height = surface_manager->Get_height(bg_buffer_id);
|
||||||
|
uint8 *surface_address = surface_manager->Lock_surface(bg_buffer_id);
|
||||||
|
for (int32 i = 0; i < jpegSurf->h; i++) {
|
||||||
|
if (i >= (int32)height) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
memcpy(surface_address + i * pitch, jpegSurf->getBasePtr(0, i), MIN(jpegSurf->pitch, pitch));
|
||||||
|
}
|
||||||
|
surface_manager->Unlock_surface(bg_buffer_id);
|
||||||
|
delete jpegStream;
|
||||||
|
|
||||||
// find the start of the weather data
|
// find the start of the weather data
|
||||||
int32 *weatherPtr = (int32 *)(bgPtr + shadowTable[1]);
|
int32 *weatherPtr = (int32 *)(bgPtr + shadowTable[1]);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue