This commit is contained in:
Alexander.Trofimov
2016-06-23 16:47:17 +03:00
parent 62fbef9f5c
commit 01a3fd5efc
1141 changed files with 3847 additions and 3847 deletions

View File

@ -220,8 +220,8 @@ bool CxImageBMP::Decode(CxFile * hFile)
case 1 :
if (off + bf.bfOffBits < bmpHeader.biSize)
{
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> ppt <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> !!!
// ОШИБКА
// файлы паттерных заливок автофигур в ppt файлах !!!
}
else
{

View File

@ -3367,7 +3367,7 @@ int32_t CxImage::OptimalThreshold(int32_t method, RECT * pBox, CxImage* pContra
}
//potential difference (based on Electrostatic Binarization method by J. Acharya & G. Sreechakra)
// L=-fabs(vdiff/vsum); <EFBFBD> molto selettivo, sembra che L=-fabs(vdiff) o L=-(vsum)
// L=-fabs(vdiff/vsum); и molto selettivo, sembra che L=-fabs(vdiff) o L=-(vsum)
// abbiano lo stesso valore di soglia... il che semplificherebbe molto la routine
double vdiff = 0;
for (k=gray_min;k<=i;k++)

View File

@ -565,7 +565,7 @@ void CxImage::SetOffset(int32_t x,int32_t y)
////////////////////////////////////////////////////////////////////////////////
/**
* \sa SetJpegQuality, GetJpegQualityF
* \author [DP]; changes [Stefan Sch<EFBFBD>rmans]
* \author [DP]; changes [Stefan Schьrmans]
*/
uint8_t CxImage::GetJpegQuality() const
{
@ -574,7 +574,7 @@ uint8_t CxImage::GetJpegQuality() const
////////////////////////////////////////////////////////////////////////////////
/**
* \sa SetJpegQuality, GetJpegQuality
* \author [Stefan Sch<EFBFBD>rmans]
* \author [Stefan Schьrmans]
*/
float CxImage::GetJpegQualityF() const
{
@ -584,7 +584,7 @@ float CxImage::GetJpegQualityF() const
/**
* quality level for JPEG and JPEG2000
* \param q: can be from 0 to 100
* \author [DP]; changes [Stefan Sch<EFBFBD>rmans]
* \author [DP]; changes [Stefan Schьrmans]
*/
void CxImage::SetJpegQuality(uint8_t q){
info.fQuality = (float)q;
@ -594,7 +594,7 @@ void CxImage::SetJpegQuality(uint8_t q){
* quality level for JPEG and JPEG2000
* necessary for JPEG2000 when quality is between 0.0 and 1.0
* \param q: can be from 0.0 to 100.0
* \author [Stefan Sch<EFBFBD>rmans]
* \author [Stefan Schьrmans]
*/
void CxImage::SetJpegQualityF(float q){
if (q>0) info.fQuality = q;

View File

@ -685,7 +685,7 @@ float CxImage::KernelBSpline(const float x)
return (0.16666666666666666667f * (a - (4.0f * b) + (6.0f * c) - (4.0f * d)));
/* equivalent <Vladim<EFBFBD>r Kloucek>
/* equivalent <Vladimнr Kloucek>
if (x < -2.0)
return(0.0f);
if (x < -1.0)
@ -718,7 +718,7 @@ float CxImage::KernelLinear(const float t)
// if (-1<=t && t<0) return 1+t;
// return 0;
//<Vladim<EFBFBD>r Kloucek>
//<Vladimнr Kloucek>
if (t < -1.0f)
return 0.0f;
if (t < 0.0f)

View File

@ -49,17 +49,17 @@ namespace MyPSD
// 1 Grayscale The first value in the color data is the gray value, from 0...10000.
// 2 Indexed
// 3 RGB The first three values in the color data are red, green, and blue.
// They are full unsigned 16<EFBFBD>bit values as in Apple<EFBFBD>s RGBColor data
// They are full unsigned 16bit values as in Apples RGBColor data
// structure. Pure red=65535,0,0.
// 4 CMYK The four values in the color data are cyan, magenta, yellow, and
// black. They are full unsigned 16<EFBFBD>bit values. 0=100% ink. Pure
// black. They are full unsigned 16bit values. 0=100% ink. Pure
// cyan=0,65535,65535,65535.
// 7 Multichannel // Have no idea
// 8 Duotone
// 9 Lab The first three values in the color data are lightness, a chrominance,
// and b chrominance.
// Lightness is a 16<EFBFBD>bit value from 0...100. The chromanance components
// are each 16<EFBFBD>bit values from <EFBFBD>128...127. Gray values
// Lightness is a 16bit value from 0...100. The chromanance components
// are each 16bit values from 128...127. Gray values
// are represented by chrominance components of 0. Pure
// white=100,0,0.
short nChannels;
@ -80,7 +80,7 @@ namespace MyPSD
struct IMAGE_RESOURCE
{
// Table 2<EFBFBD>1: Image resource block
// Table 21: Image resource block
// Type Name Description
//-------------------------------------------
// OSType Type Photoshop always uses its signature, 8BIM
@ -140,18 +140,18 @@ namespace MyPSD
// Color-ID Name Description
//-------------------------------------------
// 0 RGB The first three values in the color data are red, green, and blue.
// They are full unsigned 16<EFBFBD>bit values as in Apple<EFBFBD>s RGBColor data
// They are full unsigned 16bit values as in Apples RGBColor data
// structure. Pure red=65535,0,0.
// 1 HSB The first three values in the color data are hue, saturation, and
// brightness. They are full unsigned 16<EFBFBD>bit values as in Apple<EFBFBD>s
// brightness. They are full unsigned 16bit values as in Apples
// HSVColor data structure. Pure red=0,65535, 65535.
// 2 CMYK The four values in the color data are cyan, magenta, yellow, and
// black. They are full unsigned 16<EFBFBD>bit values. 0=100% ink. Pure
// black. They are full unsigned 16bit values. 0=100% ink. Pure
// cyan=0,65535,65535,65535.
// 7 Lab The first three values in the color data are lightness, a chrominance,
// and b chrominance.
// Lightness is a 16<EFBFBD>bit value from 0...10000. The chromanance components
// are each 16<EFBFBD>bit values from <EFBFBD>12800...12700. Gray values
// Lightness is a 16bit value from 0...10000. The chromanance components
// are each 16bit values from 12800...12700. Gray values
// are represented by chrominance components of 0. Pure
// white=10000,0,0.
// 8 grayscale The first value in the color data is the gray value, from 0...10000.
@ -171,7 +171,7 @@ namespace MyPSD
// thumbnail information in the same format except the data section is
// (blue, green, red). The Adobe Photoshop 4.0 format is at resource ID
// and the Adobe Photoshop 5.0 format is at resource ID 1036.
// Table 2<EFBFBD>5: Thumnail resource header
// Table 25: Thumnail resource header
// Type Name Description
//-------------------------------------------
// 4 bytes format = 1 (kJpegRGB). Also supports kRawRGB (0).
@ -668,7 +668,7 @@ namespace MyPSD
// for all other modes this section is 4 bytes length, the length field is set to zero
// For indexed color images, the length will be equal to 768, and the color
// will contain the color table for the image, in non<EFBFBD>interleaved order.
// will contain the color table for the image, in noninterleaved order.
// For duotone images, the color data will contain the duotone specification,
// the format of which is not documented. Other applications that read

View File

@ -1,4 +1,4 @@
// xImaWnd.cpp : Windows functions
// xImaWnd.cpp : Windows functions
/* 07/08/2001 v1.00 - Davide Pizzolato - www.xdp.it
* CxImage version 7.0.2 07/Feb/2011
*/

View File

@ -542,7 +542,7 @@ typedef struct _psd_path
// Channel information, Six bytes per channel
typedef struct _psd_channel_info
{
psd_short channel_id; // 2 bytes for Channel ID: 0 = red, 1 = green, etc.; <EFBFBD>C1 = transparency mask; <EFBFBD>C2 = user supplied layer mask
psd_short channel_id; // 2 bytes for Channel ID: 0 = red, 1 = green, etc.; 1 = transparency mask; 2 = user supplied layer mask
psd_int data_length; // 4 bytes for length of corresponding channel data. (**PSB** 8 bytes for length of corresponding channel data.)
psd_bool restricted;
} psd_channel_info;
@ -601,7 +601,7 @@ struct _psd_layer_record
psd_channel_info * channel_info; //Channel information
psd_blend_mode blend_mode; // Blend mode key
psd_uchar opacity; // 0 = transparent ... 255 = opaque
psd_bool clipping; // 0 = base, 1 = non<EFBFBD>Cbase
psd_bool clipping; // 0 = base, 1 = nonbase
psd_bool transparency_protected;
psd_bool visible;
psd_bool obsolete;
@ -724,31 +724,31 @@ typedef struct _psd_layer_color_balance
// HUE/SATURATION
// Hue/Saturation settings files are loaded and saved in Photoshop<EFBFBD><EFBFBD>s Hue/Saturation dialog
// Hue/Saturation settings files are loaded and saved in Photoshops Hue/Saturation dialog
typedef struct _psd_layer_hue_saturation
{
psd_uchar hue_or_colorization; // 0 = Use settings for hue-adjustment; 1 = Use settings for colorization.
psd_short colorization_hue; // Photoshop 5.0: The actual values are stored for the new version. Hue is - 180...180, Saturation is 0...100, and Lightness is -100...100.
psd_short colorization_saturation;// Photoshop 4.0: Three psd_short integers Hue, Saturation, and Lightness from <EFBFBD>C100...100.
psd_short colorization_lightness; // The user interface represents hue as <EFBFBD>C180...180, saturation as 0...100, and Lightness as -100...1000, as the traditional HSB color wheel, with red = 0.
psd_short colorization_saturation;// Photoshop 4.0: Three psd_short integers Hue, Saturation, and Lightness from 100...100.
psd_short colorization_lightness; // The user interface represents hue as 180...180, saturation as 0...100, and Lightness as -100...1000, as the traditional HSB color wheel, with red = 0.
psd_short master_hue; // Master hue, saturation and lightness values.
psd_short master_saturation;
psd_short master_lightness;
psd_short range_values[6][4]; // For RGB and CMYK, those values apply to each of the six hextants in the HSB color wheel: those image pixels nearest to red, yellow, green, cyan, blue, or magenta. These numbers appear in the user interface from <EFBFBD>C60...60, however the slider will reflect each of the possible 201 values from <EFBFBD>C100...100.
psd_short setting_values[6][3]; // For Lab, the first four of the six values are applied to image pixels in the four Lab color quadrants, yellow, green, blue, and magenta. The other two values are ignored ( = 0). The values appear in the user interface from <EFBFBD>C90 to 90.
psd_short range_values[6][4]; // For RGB and CMYK, those values apply to each of the six hextants in the HSB color wheel: those image pixels nearest to red, yellow, green, cyan, blue, or magenta. These numbers appear in the user interface from 60...60, however the slider will reflect each of the possible 201 values from 100...100.
psd_short setting_values[6][3]; // For Lab, the first four of the six values are applied to image pixels in the four Lab color quadrants, yellow, green, blue, and magenta. The other two values are ignored ( = 0). The values appear in the user interface from 90 to 90.
psd_uchar lookup_table[6][360];
} psd_layer_hue_saturation;
// SELECTIVE COLOR
// Selective Color settings files are loaded and saved in Photoshop<EFBFBD><EFBFBD>s Selective Color dialog.
// Selective Color settings files are loaded and saved in Photoshops Selective Color dialog.
typedef struct _psd_layer_selective_color
{
psd_ushort correction_method; // 0 = Apply color correction in relative mode; 1 = Apply color correction in absolute mode.
psd_short cyan_correction[10]; // Amount of cyan correction. Short integer from <EFBFBD>C100...100.
psd_short magenta_correction[10]; // Amount of magenta correction. Short integer from <EFBFBD>C100...100.
psd_short yellow_correction[10]; // Amount of yellow correction. Short integer from <EFBFBD>C100...100.
psd_short black_correction[10]; // Amount of black correction. Short integer from <EFBFBD>C100...100.
psd_short cyan_correction[10]; // Amount of cyan correction. Short integer from 100...100.
psd_short magenta_correction[10]; // Amount of magenta correction. Short integer from 100...100.
psd_short yellow_correction[10]; // Amount of yellow correction. Short integer from 100...100.
psd_short black_correction[10]; // Amount of black correction. Short integer from 100...100.
} psd_layer_selective_color;