Clean up.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14924 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Pfeiffer 2005-11-14 19:08:35 +00:00
parent 614de12d9c
commit 4a6c604ad4
3 changed files with 486 additions and 486 deletions

View File

@ -1,5 +1,5 @@
/*****************************************************************************/
// BeUtils.cpp
// BeUtils.h
//
// Version: 1.0.0d1
//

View File

@ -1,148 +1,148 @@
/*
* HalftoneEngine.h
* Copyright 1999-2000 Y.Takagi. All Rights Reserved.
*/
#ifndef __HALFTONE_H
#define __HALFTONE_H
#include <GraphicsDefs.h>
// definition for B_RGB32 (=B_RGB32_LITTLE) and B_RGBA32
typedef struct {
uchar blue;
uchar green;
uchar red;
uchar alpha; // unused in B_RGB32
} ColorRGB32Little;
// definition for B_RGB32_BIG and B_RGBA32_BIG
typedef struct {
uchar alpha; // unused in B_RGB32_BIG
uchar red;
uchar green;
uchar blue;
} ColorRGB32Big;
typedef union {
ColorRGB32Little little;
ColorRGB32Big big;
} ColorRGB32;
class Halftone;
typedef void (Halftone::*PFN_dither)(uchar *dst, const uchar *src, int x, int y, int width);
typedef uint (*PFN_gray)(ColorRGB32 c);
class Halftone {
public:
enum DitherType {
kType1,
kType2,
kType3,
kTypeFloydSteinberg,
};
enum GrayFunction {
kMixToGray,
kRedChannel,
kGreenChannel,
kBlueChannel
};
enum Planes {
kPlaneMonochrome1, // 1 bit depth (0 white, 1 black)
kPlaneRGB1, // 3 planes, 1 bit depth (0 black, 7 white)
};
enum BlackValue {
kHighValueMeansBlack,
kLowValueMeansBlack,
};
Halftone(color_space cs, double gamma = 1.4, double min = 0.0, DitherType dither_type = kTypeFloydSteinberg);
~Halftone();
void setPlanes(Planes planes);
void setBlackValue(BlackValue blackValue);
void dither(uchar *dst, const uchar *src, int x, int y, int width);
int getPixelDepth() const;
const uchar *getPattern() const;
void setPattern(const uchar *pattern);
protected:
// PFN_gray: return value of 0 means low density (or black) and value of 255 means high density (or white)
PFN_gray getGrayFunction() const;
void setGrayFunction(PFN_gray gray);
void setGrayFunction(GrayFunction grayFunction);
void createGammaTable(double gamma, double min);
void initElements(int x, int y, uchar *elements);
uint getDensity(ColorRGB32 c) const;
uchar convertUsingBlackValue(uchar byte) const;
void ditherRGB32(uchar *dst, const uchar *src, int x, int y, int width);
void initFloydSteinberg();
void deleteErrorTables();
void uninitFloydSteinberg();
void setupErrorBuffer(int x, int y, int width);
void ditherFloydSteinberg(uchar *dst, const uchar* src, int x, int y, int width);
Halftone(const Halftone &);
Halftone &operator = (const Halftone &);
private:
enum {
kGammaTableSize = 256,
kMaxNumberOfPlanes = 3
};
PFN_dither fDither;
PFN_gray fGray;
int fPixelDepth;
Planes fPlanes;
BlackValue fBlackValue;
const uchar *fPattern;
uint fGammaTable[kGammaTableSize];
int fNumberOfPlanes;
int fCurrentPlane;
// fields used for floyd-steinberg dithering
int fX;
int fY;
int fWidth;
int *fErrorTables[kMaxNumberOfPlanes];
};
inline int Halftone::getPixelDepth() const
{
return fPixelDepth;
}
inline const uchar * Halftone::getPattern() const
{
return fPattern;
}
inline void Halftone::setPattern(const uchar *pattern)
{
fPattern = pattern;
}
inline PFN_gray Halftone::getGrayFunction() const
{
return fGray;
}
inline void Halftone::setGrayFunction(PFN_gray gray)
{
fGray = gray;
}
inline uint Halftone::getDensity(ColorRGB32 c) const
{
return fGammaTable[fGray(c)];
}
inline uchar Halftone::convertUsingBlackValue(uchar byte) const
{
// bits with value = '1' in byte mean black
if (fBlackValue == kHighValueMeansBlack) {
return byte;
} else {
return ~byte;
}
}
#endif /* __HALFTONE_H */
/*
* Halftone.h
* Copyright 1999-2000 Y.Takagi. All Rights Reserved.
*/
#ifndef __HALFTONE_H
#define __HALFTONE_H
#include <GraphicsDefs.h>
// definition for B_RGB32 (=B_RGB32_LITTLE) and B_RGBA32
typedef struct {
uchar blue;
uchar green;
uchar red;
uchar alpha; // unused in B_RGB32
} ColorRGB32Little;
// definition for B_RGB32_BIG and B_RGBA32_BIG
typedef struct {
uchar alpha; // unused in B_RGB32_BIG
uchar red;
uchar green;
uchar blue;
} ColorRGB32Big;
typedef union {
ColorRGB32Little little;
ColorRGB32Big big;
} ColorRGB32;
class Halftone;
typedef void (Halftone::*PFN_dither)(uchar *dst, const uchar *src, int x, int y, int width);
typedef uint (*PFN_gray)(ColorRGB32 c);
class Halftone {
public:
enum DitherType {
kType1,
kType2,
kType3,
kTypeFloydSteinberg,
};
enum GrayFunction {
kMixToGray,
kRedChannel,
kGreenChannel,
kBlueChannel
};
enum Planes {
kPlaneMonochrome1, // 1 bit depth (0 white, 1 black)
kPlaneRGB1, // 3 planes, 1 bit depth (0 black, 7 white)
};
enum BlackValue {
kHighValueMeansBlack,
kLowValueMeansBlack,
};
Halftone(color_space cs, double gamma = 1.4, double min = 0.0, DitherType dither_type = kTypeFloydSteinberg);
~Halftone();
void setPlanes(Planes planes);
void setBlackValue(BlackValue blackValue);
void dither(uchar *dst, const uchar *src, int x, int y, int width);
int getPixelDepth() const;
const uchar *getPattern() const;
void setPattern(const uchar *pattern);
protected:
// PFN_gray: return value of 0 means low density (or black) and value of 255 means high density (or white)
PFN_gray getGrayFunction() const;
void setGrayFunction(PFN_gray gray);
void setGrayFunction(GrayFunction grayFunction);
void createGammaTable(double gamma, double min);
void initElements(int x, int y, uchar *elements);
uint getDensity(ColorRGB32 c) const;
uchar convertUsingBlackValue(uchar byte) const;
void ditherRGB32(uchar *dst, const uchar *src, int x, int y, int width);
void initFloydSteinberg();
void deleteErrorTables();
void uninitFloydSteinberg();
void setupErrorBuffer(int x, int y, int width);
void ditherFloydSteinberg(uchar *dst, const uchar* src, int x, int y, int width);
Halftone(const Halftone &);
Halftone &operator = (const Halftone &);
private:
enum {
kGammaTableSize = 256,
kMaxNumberOfPlanes = 3
};
PFN_dither fDither;
PFN_gray fGray;
int fPixelDepth;
Planes fPlanes;
BlackValue fBlackValue;
const uchar *fPattern;
uint fGammaTable[kGammaTableSize];
int fNumberOfPlanes;
int fCurrentPlane;
// fields used for floyd-steinberg dithering
int fX;
int fY;
int fWidth;
int *fErrorTables[kMaxNumberOfPlanes];
};
inline int Halftone::getPixelDepth() const
{
return fPixelDepth;
}
inline const uchar * Halftone::getPattern() const
{
return fPattern;
}
inline void Halftone::setPattern(const uchar *pattern)
{
fPattern = pattern;
}
inline PFN_gray Halftone::getGrayFunction() const
{
return fGray;
}
inline void Halftone::setGrayFunction(PFN_gray gray)
{
fGray = gray;
}
inline uint Halftone::getDensity(ColorRGB32 c) const
{
return fGammaTable[fGray(c)];
}
inline uchar Halftone::convertUsingBlackValue(uchar byte) const
{
// bits with value = '1' in byte mean black
if (fBlackValue == kHighValueMeansBlack) {
return byte;
} else {
return ~byte;
}
}
#endif /* __HALFTONE_H */

View File

@ -1,337 +1,337 @@
/*
* HalftoneEngine.cpp
* Copyright 1999-2000 Y.Takagi. All Rights Reserved.
*/
#include <Debug.h>
#include <InterfaceDefs.h>
#include <math.h>
#include <memory>
#include "Halftone.h"
#include "ValidRect.h"
#include "DbgMsg.h"
#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE))
using namespace std;
#else
#define std
#endif
#include "Pattern.h"
static uint gray(ColorRGB32 c)
{
if (c.little.red == c.little.green && c.little.red == c.little.blue) {
return c.little.red;
} else {
return (c.little.red * 3 + c.little.green * 6 + c.little.blue) / 10;
}
}
static uint channel_red(ColorRGB32 c)
{
return c.little.red;
}
static uint channel_green(ColorRGB32 c)
{
return c.little.green;
}
static uint channel_blue(ColorRGB32 c)
{
return c.little.blue;
}
Halftone::Halftone(color_space cs, double gamma, double min, DitherType dither_type)
{
fPixelDepth = color_space2pixel_depth(cs);
fGray = gray;
setPlanes(kPlaneMonochrome1);
setBlackValue(kHighValueMeansBlack);
initFloydSteinberg();
createGammaTable(gamma, min);
if (dither_type == kTypeFloydSteinberg) {
fDither = &Halftone::ditherFloydSteinberg;
return;
}
switch (dither_type) {
case kType2:
fPattern = pattern16x16_type2;
break;
case kType3:
fPattern = pattern16x16_type3;
break;
default:
fPattern = pattern16x16_type1;
break;
}
switch (cs) {
case B_RGB32:
case B_RGB32_BIG:
fDither = &Halftone::ditherRGB32;
break;
default:
fDither = NULL;
break;
}
}
Halftone::~Halftone()
{
uninitFloydSteinberg();
}
void Halftone::setPlanes(Planes planes)
{
fPlanes = planes;
if (planes == kPlaneMonochrome1) {
fNumberOfPlanes = 1;
fGray = gray;
} else {
ASSERT(planes == kPlaneRGB1);
fNumberOfPlanes = 3;
}
fCurrentPlane = 0;
}
void Halftone::setBlackValue(BlackValue blackValue)
{
fBlackValue = blackValue;
}
void Halftone::createGammaTable(double gamma, double min)
{
uint *g = fGammaTable;
const double kScalingFactor = 255.0 - min;
for (int i = 0; i < kGammaTableSize; i++) {
const double kGammaCorrectedValue = pow((double)i / 255.0, gamma);
const double kTranslatedValue = min + kGammaCorrectedValue * kScalingFactor;
*g++ = (uint)(kTranslatedValue);
}
}
void Halftone::initElements(int x, int y, uchar *elements)
{
x &= 0x0F;
y &= 0x0F;
const uchar *left = &fPattern[y * 16];
const uchar *pos = left + x;
const uchar *right = left + 0x0F;
for (int i = 0; i < 16; i++) {
*elements++ = *pos;
if (pos >= right) {
pos = left;
} else {
pos++;
}
}
}
void Halftone::dither(
uchar *dst,
const uchar *src,
int x,
int y,
int width)
{
if (fPlanes == kPlaneRGB1) {
switch (fCurrentPlane) {
case 0:
setGrayFunction(kRedChannel);
break;
case 1:
setGrayFunction(kGreenChannel);
break;
case 2:
setGrayFunction(kBlueChannel);
break;
}
} else {
ASSERT(fGray == &gray);
}
(this->*fDither)(dst, src, x, y, width);
// next plane
fCurrentPlane ++;
if (fCurrentPlane >= fNumberOfPlanes) {
fCurrentPlane = 0;
}
}
void Halftone::setGrayFunction(GrayFunction grayFunction)
{
PFN_gray function = NULL;
switch (grayFunction) {
case kMixToGray: function = gray;
break;
case kRedChannel: function = channel_red;
break;
case kGreenChannel: function = channel_green;
break;
case kBlueChannel: function = channel_blue;
break;
};
setGrayFunction(function);
}
void Halftone::ditherRGB32(
uchar *dst,
const uchar *a_src,
int x,
int y,
int width)
{
uchar elements[16];
initElements(x, y, elements);
const ColorRGB32 *src = (const ColorRGB32 *)a_src;
int widthByte = (width + 7) / 8;
int remainder = width % 8;
if (remainder == 0)
remainder = 8;
ColorRGB32 c;
uchar cur; // cleared bit means white, set bit means black
uint density;
int i, j;
uchar *e = elements;
uchar *last_e = elements + 16;
c = *src;
density = getDensity(c);
if (width >= 8) {
for (i = 0; i < widthByte - 1; i++) {
cur = 0;
if (e == last_e) {
e = elements;
}
for (j = 0; j < 8; j++) {
if (c.little.red != src->little.red || c.little.green != src->little.green || c.little.blue != src->little.blue) {
c = *src;
density = getDensity(c);
}
src++;
if (density <= *e++) {
cur |= (0x80 >> j);
}
}
*dst++ = convertUsingBlackValue(cur);
}
}
if (remainder > 0) {
cur = 0;
if (e == last_e) {
e = elements;
}
for (j = 0; j < remainder; j++) {
if (c.little.red != src->little.red || c.little.green != src->little.green || c.little.blue != src->little.blue) {
c = *src;
density = getDensity(c);
}
src++;
if (density <= *e++) {
cur |= (0x80 >> j);
}
}
*dst++ = convertUsingBlackValue(cur);
}
}
// Floyd-Steinberg dithering
void Halftone::initFloydSteinberg()
{
for (int i = 0; i < kMaxNumberOfPlanes; i ++) {
fErrorTables[i] = NULL;
}
}
void Halftone::deleteErrorTables()
{
for (int i = 0; i < kMaxNumberOfPlanes; i ++) {
delete fErrorTables[i];
fErrorTables[i] = NULL;
}
}
void Halftone::uninitFloydSteinberg()
{
deleteErrorTables();
}
void Halftone::setupErrorBuffer(int x, int y, int width)
{
deleteErrorTables();
fX = x;
fY = y;
fWidth = width;
for (int i = 0; i < fNumberOfPlanes; i ++) {
// reserve also space for sentinals at both ends of error table
const int size = width + 2;
fErrorTables[i] = new int[size];
memset(fErrorTables[i], 0, sizeof(int) * size);
}
}
void Halftone::ditherFloydSteinberg(uchar *dst, const uchar* a_src, int x, int y, int width)
{
if (fErrorTables[fCurrentPlane] == NULL || fX != x || fCurrentPlane == 0 && fY != y - 1 || fCurrentPlane > 0 && fY != y || fWidth != width) {
setupErrorBuffer(x, y, width);
} else {
fY = y;
}
int* error_table = &fErrorTables[fCurrentPlane][1];
int current_error = error_table[0], error;
error_table[0] = 0;
const ColorRGB32 *src = (const ColorRGB32 *)a_src;
uchar cur = 0; // cleared bit means white, set bit means black
for (int x = 0; x < width; x ++, src ++) {
const int bit = 7 - x % 8;
const int density = getDensity(*src) + current_error / 16;
if (density < 128) {
error = density;
cur |= (1 << bit);
} else {
error = density - 255;
}
// distribute error using this pattern:
// 0 X 7 (current_error)
// (left) 3 5 1 (right)
// (middle)
int* right = &error_table[x+1];
current_error = (*right) + 7 * error;
*right = 1 * error;
int* middle = right - 1;
*middle += 5 * error;
int* left = middle - 1;
*left += 3 * error;
if (bit == 0) {
*dst = convertUsingBlackValue(cur);
// advance to next byte
dst ++;
cur = 0;
}
}
const bool hasRest = (width % 8) != 0;
if (hasRest) {
*dst = convertUsingBlackValue(cur);
}
}
/*
* Halftone.cpp
* Copyright 1999-2000 Y.Takagi. All Rights Reserved.
*/
#include <Debug.h>
#include <InterfaceDefs.h>
#include <math.h>
#include <memory>
#include "Halftone.h"
#include "ValidRect.h"
#include "DbgMsg.h"
#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE))
using namespace std;
#else
#define std
#endif
#include "Pattern.h"
static uint gray(ColorRGB32 c)
{
if (c.little.red == c.little.green && c.little.red == c.little.blue) {
return c.little.red;
} else {
return (c.little.red * 3 + c.little.green * 6 + c.little.blue) / 10;
}
}
static uint channel_red(ColorRGB32 c)
{
return c.little.red;
}
static uint channel_green(ColorRGB32 c)
{
return c.little.green;
}
static uint channel_blue(ColorRGB32 c)
{
return c.little.blue;
}
Halftone::Halftone(color_space cs, double gamma, double min, DitherType dither_type)
{
fPixelDepth = color_space2pixel_depth(cs);
fGray = gray;
setPlanes(kPlaneMonochrome1);
setBlackValue(kHighValueMeansBlack);
initFloydSteinberg();
createGammaTable(gamma, min);
if (dither_type == kTypeFloydSteinberg) {
fDither = &Halftone::ditherFloydSteinberg;
return;
}
switch (dither_type) {
case kType2:
fPattern = pattern16x16_type2;
break;
case kType3:
fPattern = pattern16x16_type3;
break;
default:
fPattern = pattern16x16_type1;
break;
}
switch (cs) {
case B_RGB32:
case B_RGB32_BIG:
fDither = &Halftone::ditherRGB32;
break;
default:
fDither = NULL;
break;
}
}
Halftone::~Halftone()
{
uninitFloydSteinberg();
}
void Halftone::setPlanes(Planes planes)
{
fPlanes = planes;
if (planes == kPlaneMonochrome1) {
fNumberOfPlanes = 1;
fGray = gray;
} else {
ASSERT(planes == kPlaneRGB1);
fNumberOfPlanes = 3;
}
fCurrentPlane = 0;
}
void Halftone::setBlackValue(BlackValue blackValue)
{
fBlackValue = blackValue;
}
void Halftone::createGammaTable(double gamma, double min)
{
uint *g = fGammaTable;
const double kScalingFactor = 255.0 - min;
for (int i = 0; i < kGammaTableSize; i++) {
const double kGammaCorrectedValue = pow((double)i / 255.0, gamma);
const double kTranslatedValue = min + kGammaCorrectedValue * kScalingFactor;
*g++ = (uint)(kTranslatedValue);
}
}
void Halftone::initElements(int x, int y, uchar *elements)
{
x &= 0x0F;
y &= 0x0F;
const uchar *left = &fPattern[y * 16];
const uchar *pos = left + x;
const uchar *right = left + 0x0F;
for (int i = 0; i < 16; i++) {
*elements++ = *pos;
if (pos >= right) {
pos = left;
} else {
pos++;
}
}
}
void Halftone::dither(
uchar *dst,
const uchar *src,
int x,
int y,
int width)
{
if (fPlanes == kPlaneRGB1) {
switch (fCurrentPlane) {
case 0:
setGrayFunction(kRedChannel);
break;
case 1:
setGrayFunction(kGreenChannel);
break;
case 2:
setGrayFunction(kBlueChannel);
break;
}
} else {
ASSERT(fGray == &gray);
}
(this->*fDither)(dst, src, x, y, width);
// next plane
fCurrentPlane ++;
if (fCurrentPlane >= fNumberOfPlanes) {
fCurrentPlane = 0;
}
}
void Halftone::setGrayFunction(GrayFunction grayFunction)
{
PFN_gray function = NULL;
switch (grayFunction) {
case kMixToGray: function = gray;
break;
case kRedChannel: function = channel_red;
break;
case kGreenChannel: function = channel_green;
break;
case kBlueChannel: function = channel_blue;
break;
};
setGrayFunction(function);
}
void Halftone::ditherRGB32(
uchar *dst,
const uchar *a_src,
int x,
int y,
int width)
{
uchar elements[16];
initElements(x, y, elements);
const ColorRGB32 *src = (const ColorRGB32 *)a_src;
int widthByte = (width + 7) / 8;
int remainder = width % 8;
if (remainder == 0)
remainder = 8;
ColorRGB32 c;
uchar cur; // cleared bit means white, set bit means black
uint density;
int i, j;
uchar *e = elements;
uchar *last_e = elements + 16;
c = *src;
density = getDensity(c);
if (width >= 8) {
for (i = 0; i < widthByte - 1; i++) {
cur = 0;
if (e == last_e) {
e = elements;
}
for (j = 0; j < 8; j++) {
if (c.little.red != src->little.red || c.little.green != src->little.green || c.little.blue != src->little.blue) {
c = *src;
density = getDensity(c);
}
src++;
if (density <= *e++) {
cur |= (0x80 >> j);
}
}
*dst++ = convertUsingBlackValue(cur);
}
}
if (remainder > 0) {
cur = 0;
if (e == last_e) {
e = elements;
}
for (j = 0; j < remainder; j++) {
if (c.little.red != src->little.red || c.little.green != src->little.green || c.little.blue != src->little.blue) {
c = *src;
density = getDensity(c);
}
src++;
if (density <= *e++) {
cur |= (0x80 >> j);
}
}
*dst++ = convertUsingBlackValue(cur);
}
}
// Floyd-Steinberg dithering
void Halftone::initFloydSteinberg()
{
for (int i = 0; i < kMaxNumberOfPlanes; i ++) {
fErrorTables[i] = NULL;
}
}
void Halftone::deleteErrorTables()
{
for (int i = 0; i < kMaxNumberOfPlanes; i ++) {
delete fErrorTables[i];
fErrorTables[i] = NULL;
}
}
void Halftone::uninitFloydSteinberg()
{
deleteErrorTables();
}
void Halftone::setupErrorBuffer(int x, int y, int width)
{
deleteErrorTables();
fX = x;
fY = y;
fWidth = width;
for (int i = 0; i < fNumberOfPlanes; i ++) {
// reserve also space for sentinals at both ends of error table
const int size = width + 2;
fErrorTables[i] = new int[size];
memset(fErrorTables[i], 0, sizeof(int) * size);
}
}
void Halftone::ditherFloydSteinberg(uchar *dst, const uchar* a_src, int x, int y, int width)
{
if (fErrorTables[fCurrentPlane] == NULL || fX != x || fCurrentPlane == 0 && fY != y - 1 || fCurrentPlane > 0 && fY != y || fWidth != width) {
setupErrorBuffer(x, y, width);
} else {
fY = y;
}
int* error_table = &fErrorTables[fCurrentPlane][1];
int current_error = error_table[0], error;
error_table[0] = 0;
const ColorRGB32 *src = (const ColorRGB32 *)a_src;
uchar cur = 0; // cleared bit means white, set bit means black
for (int x = 0; x < width; x ++, src ++) {
const int bit = 7 - x % 8;
const int density = getDensity(*src) + current_error / 16;
if (density < 128) {
error = density;
cur |= (1 << bit);
} else {
error = density - 255;
}
// distribute error using this pattern:
// 0 X 7 (current_error)
// (left) 3 5 1 (right)
// (middle)
int* right = &error_table[x+1];
current_error = (*right) + 7 * error;
*right = 1 * error;
int* middle = right - 1;
*middle += 5 * error;
int* left = middle - 1;
*left += 3 * error;
if (bit == 0) {
*dst = convertUsingBlackValue(cur);
// advance to next byte
dst ++;
cur = 0;
}
}
const bool hasRest = (width % 8) != 0;
if (hasRest) {
*dst = convertUsingBlackValue(cur);
}
}