TDE
/
libkdcraw
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/libkdcraw
0
0
Fork 0
Code Issues Releases Wiki Activity

rename the following methods:

Browse Source 
tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/libraries/libkdcraw@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 2159e0704b
commit 6cba6db9bc
10 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File

8
libkdcraw/dcraw/dcraw.c
Unescape View File

@ -1597,12 +1597,12 @@ void CLASS phase_one_correct()
void CLASS phase_one_load_raw()
{
int row, col, a, b;
ushort *pixel, akey, bkey, tqmask;
ushort *pixel, akey, bkey, mask;
fseek (ifp, ph1.key_off, SEEK_SET);
akey = get2();
bkey = get2();
tqmask = ph1.format == 1 ? 0x5555:0x1354;
mask = ph1.format == 1 ? 0x5555:0x1354;
fseek (ifp, data_offset + top_margin*raw_width*2, SEEK_SET);
pixel = (ushort *) calloc (raw_width, sizeof *pixel);
merror (pixel, "phase_one_load_raw()");
@ -1611,8 +1611,8 @@ void CLASS phase_one_load_raw()
for (col=0; col < raw_width; col+=2) {
a = pixel[col+0] ^ akey;
b = pixel[col+1] ^ bkey;
pixel[col+0] = (a & tqmask) | (b & ~tqmask);
pixel[col+1] = (b & tqmask) | (a & ~tqmask);
pixel[col+0] = (a & mask) | (b & ~mask);
pixel[col+1] = (b & mask) | (a & ~mask);
}
for (col=0; col < width; col++)
BAYER(row,col) = pixel[col+left_margin];

8
libkdcraw/libkdcraw/dcrawsettingswidget.cpp
Unescape View File

@ -147,16 +147,16 @@ public:
RDoubleNumInput *brightnessSpinBox;
};
DcrawSettingsWidget::DcrawSettingsWidget(TQWidget *tqparent, int advSettings)
: TQToolBox(tqparent)
DcrawSettingsWidget::DcrawSettingsWidget(TQWidget *parent, int advSettings)
: TQToolBox(parent)
{
setup(advSettings);
}
DcrawSettingsWidget::DcrawSettingsWidget(TQWidget *tqparent, bool sixteenBitsOption,
DcrawSettingsWidget::DcrawSettingsWidget(TQWidget *parent, bool sixteenBitsOption,
bool outputColorSpaceOption,
bool postProcessingOptions)
: TQToolBox(tqparent)
: TQToolBox(parent)
{
int advSettings = 0;

4
libkdcraw/libkdcraw/dcrawsettingswidget.h
Unescape View File

@ -72,8 +72,8 @@ public:
/**
* @param advSettings the default value is COLORSPACE
*/
DcrawSettingsWidget(TQWidget *tqparent, int advSettings);
DcrawSettingsWidget(TQWidget *tqparent,
DcrawSettingsWidget(TQWidget *parent, int advSettings);
DcrawSettingsWidget(TQWidget *parent,
bool sixteenBitsOption=false,
bool outputColorSpaceOption=true,
bool postProcessingOptions=false);

4
libkdcraw/libkdcraw/rcombobox.cpp
Unescape View File

@ -60,8 +60,8 @@ public:
KComboBox *combo;
};
RComboBox::RComboBox(TQWidget *tqparent)
: TQHBox(tqparent)
RComboBox::RComboBox(TQWidget *parent)
: TQHBox(parent)
{
d = new RComboBoxPriv;

2
libkdcraw/libkdcraw/rcombobox.h
Unescape View File

@ -50,7 +50,7 @@ Q_OBJECT
public:
RComboBox(TQWidget *tqparent=0);
RComboBox(TQWidget *parent=0);
~RComboBox();
void setCurrentItem(int d);

8
libkdcraw/libkdcraw/rnuminput.cpp
Unescape View File

@ -61,8 +61,8 @@ public:
KIntNumInput *input;
};
RIntNumInput::RIntNumInput(TQWidget *tqparent)
: TQHBox(tqparent)
RIntNumInput::RIntNumInput(TQWidget *parent)
: TQHBox(parent)
{
d = new RIntNumInputPriv;
@ -159,8 +159,8 @@ public:
KDoubleNumInput *input;
};
RDoubleNumInput::RDoubleNumInput(TQWidget *tqparent)
: TQHBox(tqparent)
RDoubleNumInput::RDoubleNumInput(TQWidget *parent)
: TQHBox(parent)
{
d = new RDoubleNumInputPriv;

4
libkdcraw/libkdcraw/rnuminput.h
Unescape View File

@ -51,7 +51,7 @@ Q_OBJECT
public:
RIntNumInput(TQWidget *tqparent=0);
RIntNumInput(TQWidget *parent=0);
~RIntNumInput();
int value();
@ -94,7 +94,7 @@ Q_OBJECT
public:
RDoubleNumInput(TQWidget *tqparent=0);
RDoubleNumInput(TQWidget *parent=0);
~RDoubleNumInput();
double value();

12
libkdcraw/libraw/internal/dcraw_common.cpp
Unescape View File

@ -1517,12 +1517,12 @@ void CLASS phase_one_correct()
void CLASS phase_one_load_raw()
{
int row, col, a, b;
ushort *pixel, akey, bkey, tqmask;
ushort *pixel, akey, bkey, mask;
fseek (ifp, ph1.key_off, SEEK_SET);
akey = get2();
bkey = get2();
tqmask = ph1.format == 1 ? 0x5555:0x1354;
mask = ph1.format == 1 ? 0x5555:0x1354;
#ifndef LIBRAW_LIBRARY_BUILD
fseek (ifp, data_offset + top_margin*raw_width*2, SEEK_SET);
pixel = (ushort *) calloc (raw_width, sizeof *pixel);
@ -1532,8 +1532,8 @@ void CLASS phase_one_load_raw()
for (col=0; col < raw_width; col+=2) {
a = pixel[col+0] ^ akey;
b = pixel[col+1] ^ bkey;
pixel[col+0] = (a & tqmask) | (b & ~tqmask);
pixel[col+1] = (b & tqmask) | (a & ~tqmask);
pixel[col+0] = (a & mask) | (b & ~mask);
pixel[col+1] = (b & mask) | (a & ~mask);
}
for (col=0; col < width; col++)
BAYER(row,col) = pixel[col+left_margin];
@ -1548,8 +1548,8 @@ void CLASS phase_one_load_raw()
for (col=0; col < raw_width; col+=2) {
a = pixel[col+0] ^ akey;
b = pixel[col+1] ^ bkey;
pixel[col+0] = (a & tqmask) | (b & ~tqmask);
pixel[col+1] = (b & tqmask) | (a & ~tqmask);
pixel[col+0] = (a & mask) | (b & ~mask);
pixel[col+1] = (b & mask) | (a & ~mask);
}
for (col=0; col < raw_width; col++)
{

2
libkdcraw/libraw/libraw/libraw_types.h
Unescape View File

@ -119,7 +119,7 @@ typedef struct
unsigned is_foveon;
int colors;
unsigned filters; // camera CFA pattern tqmask
unsigned filters; // camera CFA pattern mask
char cdesc[5];
}libraw_iparams_t;

2
libkdcraw/libraw/samples/unprocessed_raw.cpp
Unescape View File

@ -118,7 +118,7 @@ int main(int ac, char *av[])
if( (ret = RawProcessor.add_masked_borders_to_bitmap() ) != LIBRAW_SUCCESS)
{
fprintf(stderr,"Cannot add tqmask data to bitmap %s\n",av[i]);
fprintf(stderr,"Cannot add mask data to bitmap %s\n",av[i]);
}
for(int r=0;r<S.iheight;r++)
for(c=0;c<S.iwidth;c++)

Write Preview
Loading…
Cancel
Save