Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,12 @@ COMPILER_FLAGS = -Werror
# specify additional linker flags
LINKER_FLAGS =

# Linux does not export executable symbols to dlopen()ed add-ons by default.
# The add-ons use ArtPaint's Manipulator and WindowGUIManipulatorView APIs.
ifeq ($(shell uname -s),Linux)
LINKER_FLAGS += -Wl,--export-dynamic
endif

# specify the version of this particular item
# (for example, -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL")
# This may also be specified in a resource.
Expand Down
23 changes: 0 additions & 23 deletions addons/AddOns/Twirl/Twirl.h
Original file line number Diff line number Diff line change
Expand Up @@ -209,29 +209,6 @@ init_sqrt_tab()
}
}


double
fsqrt(double f)
{
unsigned int e;
unsigned int *fi = (unsigned int *)&f + MOST_SIG_OFFSET;

if (f == 0.0)
return(0.0);

e = (*fi >> EXP_SHIFTS) - EXP_BIAS;
*fi &= MANT_MASK;

if (e & 1)
*fi |= EXP_LSB;

e >>= 1;
*fi = (sqrt_tab[*fi >> MANT_SHIFTS])
| ((e + EXP_BIAS) << EXP_SHIFTS);

return (f);
}

void
dump_sqrt_tab()
{
Expand Down
23 changes: 0 additions & 23 deletions addons/AddOns/Wave/Wave.h
Original file line number Diff line number Diff line change
Expand Up @@ -219,29 +219,6 @@ init_sqrt_tab()
}


double
fsqrt(double f)
{
unsigned int e;
unsigned int* fi = (unsigned int *) &f + MOST_SIG_OFFSET;

if (f == 0.0)
return (0.0);

e = (*fi >> EXP_SHIFTS) - EXP_BIAS;
*fi &= MANT_MASK;

if (e & 1)
*fi |= EXP_LSB;

e >>= 1;
*fi = (sqrt_tab[*fi >> MANT_SHIFTS])
| ((e + EXP_BIAS) << EXP_SHIFTS);

return(f);
}


void
dump_sqrt_tab()
{
Expand Down
2 changes: 1 addition & 1 deletion artpaint/application/PixelOperations.h
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ inline uint32 colorblend(uint32 dst, uint32 src, uint32 mode)
hsl2rgb(dh, ss, dl, tr, tg, tb);
else if (mode == BLEND_LIGHTNESS)
hsl2rgb(dh, ds, sl, tr, tg, tb);
else if (mode == BLEND_COLOR)
else // BLEND_COLOR
hsl2rgb(sh, ss, dl, tr, tg, tb);

target_rgb.bytes[0] = (uint8)max_c(0, min_c(255, tb));
Expand Down
2 changes: 2 additions & 0 deletions artpaint/controls/CMYColorControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ class CMYColorControl : public MultichannelColorControl {

void AttachedToWindow();
void MessageReceived(BMessage* message);

using MultichannelColorControl::SetValue;
virtual void SetValue(rgb_color c);
virtual void SetValue(float one, float two, float three, float four, float five);
rgb_color ValueAsColor();
Expand Down
2 changes: 2 additions & 0 deletions artpaint/controls/FloatControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ class FloatControl : public BTextControl {
bool allowNegative = false, bool continuous = true);

float Value() const;

using BTextControl::SetValue;
virtual void SetValue(float value);
void SetWidthInBytes(uint32 bytes);

Expand Down
2 changes: 2 additions & 0 deletions artpaint/controls/MultichannelColorControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ class MultichannelColorControl : public BControl {

void AttachedToWindow();
void MessageReceived(BMessage* message);

using BControl::SetValue;
void SetValue(uint32 val);
virtual void SetValue(rgb_color c);
virtual void SetValue(float one, float two, float three, float four);
Expand Down
18 changes: 15 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh -e
#!/bin/env bash
set -e

# Build script for ArtPaint
#
Expand Down Expand Up @@ -30,7 +31,12 @@ builder() {
if [ "$action" = "catkeys" ] ; then
make -f Makefile OBJ_DIR="objects_addons$debug_suffix" catkeys
fi
make OBJ_DIR="objects_addons$debug_suffix" bindcatalogs
if [ "$(uname)" = "Haiku" ] ; then
make OBJ_DIR="objects_addons$debug_suffix" bindcatalogs
else
# Non-Haiku platforms cannot add resources to an already-linked binary.
make OBJ_DIR="objects_addons$debug_suffix" catalogsinstall
fi
popd > /dev/null
done

Expand All @@ -45,7 +51,13 @@ builder() {
if [ "$action" = "catkeys" ] ; then
make -f Makefile OBJ_DIR="objects_artpaint$debug_suffix" catkeys
fi
make -f Makefile OBJ_DIR="objects_artpaint$debug_suffix" bindcatalogs

if [ "$(uname)" = "Haiku" ] ; then
make OBJ_DIR="objects_artpaint$debug_suffix" bindcatalogs
else
# Non-Haiku platforms cannot add resources to an already-linked binary.
make OBJ_DIR="objects_artpaint$debug_suffix" catalogsinstall
fi

echo "Moving final executable into dist folder"
mkdir -p dist
Expand Down
Loading