diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 427cda6bdc..b67c9d7a2b 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -35,7 +35,7 @@ BEOS_BIN = addattr alert arp basename beep cat catattr chgrp chmod chop chown cl BEOS_APPS = Terminal Expander People ShowImage Clock Pulse Playground SoundRecorder BitmapDrawing Magnify DiskProbe AboutHaiku - StyledEdit Installer Chart Workspaces Cortex CortexAddOnHost GLTeapot + StyledEdit Installer Chart Workspaces $(X86_ONLY)Cortex $(X86_ONLY)CortexAddOnHost $(X86_ONLY)GLTeapot MediaPlayer ; BEOS_PREFERENCES = Backgrounds DataTranslations FileTypes Fonts Media Menu @@ -44,7 +44,7 @@ BEOS_PREFERENCES = Backgrounds DataTranslations FileTypes Fonts Media Menu BEOS_SYSTEM_LIB = libbe.so $(HAIKU_LIBSTDC++) libnet.so libmedia.so libtracker.so libtranslation.so libnetwork.so libbind.so libnetapi.so libsocket.so libdebug.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libmidi2.so - libdevice.so libgame.so libscreensaver.so libroot.so libmail.so libGL.so + libdevice.so libgame.so libscreensaver.so libroot.so libmail.so $(X86_ONLY)libGL.so ; BEOS_SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server media_addon_server input_server app_server fake_app_server midi_server @@ -69,7 +69,7 @@ BEOS_ADD_ONS_MEDIA = mixer.media_addon #legacy.media_addon ; BEOS_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder - aiff_reader au_reader avcodec avi_reader + aiff_reader au_reader $(X86_ONLY)avcodec avi_reader matroska mov_reader mp3_decoder mp3_reader mp4_reader musepack diff --git a/headers/os/translation/TranslatorRoster.h b/headers/os/translation/TranslatorRoster.h index f0684ab010..f8f0932c6b 100644 --- a/headers/os/translation/TranslatorRoster.h +++ b/headers/os/translation/TranslatorRoster.h @@ -74,6 +74,8 @@ class BTranslatorRoster : public BArchivable { status_t StartWatching(BMessenger target); status_t StopWatching(BMessenger target); + class Private; + private: // unimplemented BTranslatorRoster(const BTranslatorRoster& other); @@ -89,7 +91,7 @@ class BTranslatorRoster : public BArchivable { void _Initialize(); private: - class Private; + friend class Private; Private* fPrivate; int32 fUnused[6]; diff --git a/src/add-ons/translators/bmp/BMPTranslator.cpp b/src/add-ons/translators/bmp/BMPTranslator.cpp index a0cf144612..b23be1b357 100644 --- a/src/add-ons/translators/bmp/BMPTranslator.cpp +++ b/src/add-ons/translators/bmp/BMPTranslator.cpp @@ -7,12 +7,13 @@ */ #include "BMPTranslator.h" +#include "BMPView.h" #include #include +#include #include -#include "BMPView.h" using std::nothrow; diff --git a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp index cb03c1e02a..e6a2f1b82a 100644 --- a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp +++ b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp @@ -57,17 +57,17 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Translation Kit required globals char translatorName[] = "JPEG2000 Images"; -char translatorInfo[] = "© 2002-2003, Shard +char translatorInfo[] = "© 2002-2003, Shard\n" + "\n" + "Based on JasPer library:\n" + "© 1999-2000, Image Power, Inc. and\n" + "the University of British Columbia, Canada.\n" + "© 2001-2003 Michael David Adams.\n" + " http://www.ece.uvic.ca/~mdadams/jasper/\n" + "\n" + "ImageMagick's jp2 codec was used as \"tutorial\".\n" + " http://www.imagemagick.org/\n"; -Based on JasPer library: -© 1999-2000, Image Power, Inc. and -the University of British Columbia, Canada. -© 2001-2003 Michael David Adams. - http://www.ece.uvic.ca/~mdadams/jasper/ - -ImageMagick's jp2 codec was used as \"tutorial\". - http://www.imagemagick.org/ -"; int32 translatorVersion = 256; // 256 = v1.0.0 // Define the formats we know how to read diff --git a/src/add-ons/translators/jpeg2000/libjasper/jp2_enc.c b/src/add-ons/translators/jpeg2000/libjasper/jp2_enc.c index cf260b3983..d65aedef2a 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jp2_enc.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jp2_enc.c @@ -126,6 +126,9 @@ #include "jp2_cod.h" + +uint_fast32_t jp2_gettypeasoc(int colorspace, int ctype); + /******************************************************************************\ * Functions. \******************************************************************************/ diff --git a/src/add-ons/translators/sgi/SGITranslator.cpp b/src/add-ons/translators/sgi/SGITranslator.cpp index f2f244d72d..40d8aaa4b0 100644 --- a/src/add-ons/translators/sgi/SGITranslator.cpp +++ b/src/add-ons/translators/sgi/SGITranslator.cpp @@ -2,7 +2,7 @@ // SGITranslator // Written by Stephan Aßmus // based on TIFFTranslator written mostly by -// Michael Wilber, OBOS Translation Kit Team +// Michael Wilber // // SGITranslator.cpp // @@ -10,7 +10,7 @@ // SGI images. // // -// Copyright (c) 2003 OpenBeOS Project +// Copyright (c) 2003-2006 Haiku Project // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the "Software"), @@ -50,6 +50,8 @@ #include "SGITranslator.h" #include "SGIView.h" +using std::nothrow; + // The input formats that this translator supports. translation_format gInputFormats[] = { { diff --git a/src/apps/expander/DirectoryFilePanel.cpp b/src/apps/expander/DirectoryFilePanel.cpp index e84ce33afe..8b0a96d0d6 100644 --- a/src/apps/expander/DirectoryFilePanel.cpp +++ b/src/apps/expander/DirectoryFilePanel.cpp @@ -12,6 +12,7 @@ #include #include +#include DirectoryRefFilter::DirectoryRefFilter() diff --git a/src/apps/mediaplayer/DrawingTidbits.cpp b/src/apps/mediaplayer/DrawingTidbits.cpp index b4fedb7a1d..c2989ef7c1 100644 --- a/src/apps/mediaplayer/DrawingTidbits.cpp +++ b/src/apps/mediaplayer/DrawingTidbits.cpp @@ -13,12 +13,14 @@ #include "DrawingTidbits.h" -#include - #include #include #include +#include +#include + + // ShiftComponent inline uchar ShiftComponent(uchar component, float percent) diff --git a/src/apps/mediaplayer/SoundOutput.cpp b/src/apps/mediaplayer/SoundOutput.cpp index b6692778f4..35f96d28e4 100644 --- a/src/apps/mediaplayer/SoundOutput.cpp +++ b/src/apps/mediaplayer/SoundOutput.cpp @@ -18,12 +18,17 @@ * */ +#include "SoundOutput.h" + #include #include #include + +#include #include -#include "SoundOutput.h" +using std::nothrow; + SoundOutput::SoundOutput(const char *name, const media_multi_audio_format &format) : fSoundPlayer(new(nothrow) BSoundPlayer(static_cast(&format), name, play_buffer, NULL, this)) diff --git a/src/apps/mediaplayer/TransportButton.cpp b/src/apps/mediaplayer/TransportButton.cpp index 7e1f9d6e9a..44ef61b530 100644 --- a/src/apps/mediaplayer/TransportButton.cpp +++ b/src/apps/mediaplayer/TransportButton.cpp @@ -23,6 +23,8 @@ #include "TransportButton.h" #include "DrawingTidbits.h" +using std::map; + class BitmapStash { // Bitmap stash is a simple class to hold all the lazily-allocated // bitmaps that the TransportButton needs when rendering itself. diff --git a/src/apps/mediaplayer/TransportControlGroup.cpp b/src/apps/mediaplayer/TransportControlGroup.cpp index 62845bf098..b7facb5ca8 100644 --- a/src/apps/mediaplayer/TransportControlGroup.cpp +++ b/src/apps/mediaplayer/TransportControlGroup.cpp @@ -59,7 +59,7 @@ TransportControlGroup::TransportControlGroup(BRect frame) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); - BRect frame(0.0, 0.0, 10.0, 10.0); + frame.Set(0.0, 0.0, 10.0, 10.0); // Seek Slider fSeekSlider = new SeekSlider(frame, "seek slider", diff --git a/src/apps/mediaplayer/VolumeSlider.cpp b/src/apps/mediaplayer/VolumeSlider.cpp index 8b86aff1bb..3cb25b6185 100644 --- a/src/apps/mediaplayer/VolumeSlider.cpp +++ b/src/apps/mediaplayer/VolumeSlider.cpp @@ -12,13 +12,15 @@ #include "VolumeSlider.h" -#include +#include "ButtonBitmaps.h" +#include "DrawingTidbits.h" #include #include -#include "ButtonBitmaps.h" -#include "DrawingTidbits.h" +#include +#include + // slider colors are hardcoded here, because that's just // what they currently are within those bitmaps diff --git a/src/apps/pulse/PrefsWindow.cpp b/src/apps/pulse/PrefsWindow.cpp index 73ebd10c62..a1c5fee855 100644 --- a/src/apps/pulse/PrefsWindow.cpp +++ b/src/apps/pulse/PrefsWindow.cpp @@ -14,7 +14,6 @@ #include "PulseApp.h" #include "ConfigView.h" -//#include #include #include #include @@ -23,8 +22,8 @@ #include -PrefsWindow::PrefsWindow(BRect rect, const char *name, BMessenger *messenger, Prefs *prefs) - : BWindow(rect, name, B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE +PrefsWindow::PrefsWindow(BRect frame, const char *name, BMessenger *messenger, Prefs *prefs) + : BWindow(frame, name, B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_ASYNCHRONOUS_CONTROLS), fTarget(*messenger), fPrefs(prefs) diff --git a/src/bin/translate.cpp b/src/bin/translate.cpp index 705996998c..c03b291373 100644 --- a/src/bin/translate.cpp +++ b/src/bin/translate.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2003-2005, Haiku. All Rights Reserved. + * Copyright 2003-2006, Haiku. All Rights Reserved. * Distributed under the terms of the MIT license. * * Authors: @@ -18,6 +18,7 @@ #include #include +#include #include #include diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp index 785033426e..6156adfe5d 100644 --- a/src/kits/app/Message.cpp +++ b/src/kits/app/Message.cpp @@ -184,7 +184,7 @@ BMessage::_InitHeader() { DEBUG_FUNCTION_ENTER; fHeader = (message_header *)malloc(sizeof(message_header)); - memset(fHeader, 0, sizeof(message_header) - sizeof(message_header::hash_table)); + memset(fHeader, 0, sizeof(message_header) - sizeof(fHeader->hash_table)); fHeader->format = kMessageMagicHaiku; fHeader->flags = MESSAGE_FLAG_VALID; @@ -227,7 +227,7 @@ BMessage::_Clear() status_t BMessage::GetInfo(type_code typeRequested, int32 index, char **nameFound, - type_code *typeFound, int32 *countFound = NULL) const + type_code *typeFound, int32 *countFound) const { DEBUG_FUNCTION_ENTER; if (typeRequested == B_ANY_TYPE) { @@ -647,7 +647,7 @@ BMessage::WasDropped() const BPoint -BMessage::DropPoint(BPoint *offset = NULL) const +BMessage::DropPoint(BPoint *offset) const { DEBUG_FUNCTION_ENTER; if (offset) diff --git a/src/kits/interface/ColorControl.cpp b/src/kits/interface/ColorControl.cpp index 60413ecdb0..14eaf58077 100644 --- a/src/kits/interface/ColorControl.cpp +++ b/src/kits/interface/ColorControl.cpp @@ -292,6 +292,7 @@ BColorControl::MessageReceived(BMessage *message) color.red = strtol(fRedText->Text(), NULL, 10); color.green = strtol(fGreenText->Text(), NULL, 10); color.blue = strtol(fBlueText->Text(), NULL, 10); + color.alpha = 255; SetValue(color); Invoke(); @@ -415,8 +416,9 @@ BColorControl::_ColorRamp(BRect rect, BView* target, { float width = rect.Width()+1; rgb_color color; + color.alpha = 255; - target->BeginLineArray(width); + target->BeginLineArray((int32)width); for (float i = 0; i <= width; i++) { color.red = (uint8)(i * baseColor.red / width); diff --git a/src/kits/interface/ColorConversion.cpp b/src/kits/interface/ColorConversion.cpp index c9f3881ff3..280c2fcadf 100644 --- a/src/kits/interface/ColorConversion.cpp +++ b/src/kits/interface/ColorConversion.cpp @@ -12,10 +12,17 @@ */ #include "ColorConversion.h" + #include -#include #include +#include +#include + + +using std::nothrow; + + namespace BPrivate { // TODO: system palette -- hard-coded for now, when the app server is ready @@ -632,8 +639,8 @@ ConvertBits(const srcByte *srcBits, dstByte *dstBits, int32 srcBitsLength, BPoint dstOffset, int32 width, int32 height, bool srcSwap, bool dstSwap, readFunc *srcFunc, writeFunc *dstFunc) { - char *srcBitsEnd = (char *)srcBits + srcBitsLength; - char *dstBitsEnd = (char *)dstBits + dstBitsLength; + uint8* srcBitsEnd = (uint8*)srcBits + srcBitsLength; + uint8* dstBitsEnd = (uint8*)dstBits + dstBitsLength; int32 srcBitsPerRow = srcBytesPerRow << 3; int32 dstBitsPerRow = dstBytesPerRow << 3; @@ -662,10 +669,10 @@ ConvertBits(const srcByte *srcBits, dstByte *dstBits, int32 srcBitsLength, dstOffsetY = 0; } - (char *)srcBits += (srcOffsetY * srcBitsPerRow + srcOffsetX - * srcBitsPerPixel) >> 3; - (char *)dstBits += (dstOffsetY * dstBitsPerRow + dstOffsetX - * dstBitsPerPixel) >> 3; + srcBits = (srcByte*)((uint8*)srcBits + (srcOffsetY * srcBitsPerRow + srcOffsetX + * srcBitsPerPixel >> 3)); + dstBits = (dstByte*)((uint8*)dstBits + (dstOffsetY * dstBitsPerRow + dstOffsetX + * dstBitsPerPixel >> 3)); // Ensure that the width fits int32 srcWidth = (srcBitsPerRow - srcOffsetX * srcBitsPerPixel) @@ -697,10 +704,10 @@ ConvertBits(const srcByte *srcBits, dstByte *dstBits, int32 srcBitsLength, srcBitsLength -= copyCount; dstBitsLength -= copyCount; - (char *)srcBits += srcBytesPerRow; - (char *)dstBits += dstBytesPerRow; + srcBits = (srcByte*)((uint8*)srcBits + srcBytesPerRow); + dstBits = (dstByte*)((uint8*)dstBits + dstBytesPerRow); - if ((char *)srcBits > srcBitsEnd || (char *)dstBits > dstBitsEnd) + if ((uint8 *)srcBits > srcBitsEnd || (uint8 *)dstBits > dstBitsEnd) return B_OK; } @@ -709,9 +716,9 @@ ConvertBits(const srcByte *srcBits, dstByte *dstBits, int32 srcBitsLength, int32 srcLinePad = (srcBitsPerRow - width * srcBitsPerPixel) >> 3; int32 dstLinePad = (dstBitsPerRow - width * dstBitsPerPixel) >> 3; + uint32 result; + uint32 source; - register uint32 result; - register uint32 source; for (int32 i = 0; i < height; i++) { for (int32 j = 0; j < width; j++) { if (srcFunc) @@ -771,12 +778,12 @@ ConvertBits(const srcByte *srcBits, dstByte *dstBits, int32 srcBitsLength, dstBits++; } - if ((char *)srcBits > srcBitsEnd || (char *)dstBits > dstBitsEnd) + if ((uint8*)srcBits > srcBitsEnd || (uint8*)dstBits > dstBitsEnd) return B_OK; } - (char *)srcBits += srcLinePad; - (char *)dstBits += dstLinePad; + srcBits = (srcByte*)((uint8*)srcBits + srcLinePad); + dstBits = (dstByte*)((uint8*)dstBits + dstLinePad); dstOffsetX -= width; srcOffsetX -= width; } @@ -901,7 +908,7 @@ ConvertBits(const srcByte *srcBits, void *dstBits, int32 srcBitsLength, break; case B_CMAP8: - palette_converter(); + BPrivate::palette_converter(); ConvertBits(srcBits, (uint8 *)dstBits, srcBitsLength, dstBitsLength, redShift - 15, greenShift - 10, blueShift - 5, 0, 0, 0x7c00, 0x03e0, 0x001f, 0x0000, srcBytesPerRow, diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp index a8d5f6ad89..721875ed45 100644 --- a/src/kits/interface/View.cpp +++ b/src/kits/interface/View.cpp @@ -3459,7 +3459,7 @@ BView::MoveTo(float x, float y) _FlushIfNotInTransaction(); } - _MoveTo(x, y); + _MoveTo((int32)x, (int32)y); } @@ -3494,7 +3494,7 @@ BView::ResizeBy(float deltaWidth, float deltaHeight) _FlushIfNotInTransaction(); } - _ResizeBy(deltaWidth, deltaHeight); + _ResizeBy((int32)deltaWidth, (int32)deltaHeight); } @@ -4118,7 +4118,7 @@ BView::_ParentResizedBy(int32 x, int32 y) if (newFrame.LeftTop() != fParentOffset) { // move view - _MoveTo(roundf(newFrame.left), roundf(newFrame.top)); + _MoveTo(lroundf(newFrame.left), lroundf(newFrame.top)); } if (newFrame != Frame()) { diff --git a/src/kits/opengl/mesa/Jamfile b/src/kits/opengl/mesa/Jamfile index 4a4fefe4e1..626d59fcf5 100644 --- a/src/kits/opengl/mesa/Jamfile +++ b/src/kits/opengl/mesa/Jamfile @@ -39,6 +39,37 @@ SubDirCcFlags -DUSE_3DNOW_ASM -DUSE_SSE_ASM ; +local archSources ; + +if $(TARGET_ARCH) = x86 { + archSources = + common_x86_asm.S + x86_xform2.S + x86_xform3.S + x86_xform4.S + x86_cliptest.S + mmx_blend.S + 3dnow_xform1.S + 3dnow_xform2.S + 3dnow_xform3.S + 3dnow_xform4.S + 3dnow_normal.S + sse_xform1.S + sse_xform2.S + sse_xform3.S + sse_xform4.S + sse_normal.S + read_rgba_span_x86.S + + # tnl + t_vtx_x86_gcc.S + ; +} else { + archSources = + t_vtx_generic.c + ; +} + StaticLibrary libmesa.a : # main @@ -198,29 +229,8 @@ StaticLibrary libmesa.a : # ppc common_ppc.c - # TODO: check if $(TARGET_ARCH) == x86? - # x86 - common_x86_asm.S - x86_xform2.S - x86_xform3.S - x86_xform4.S - x86_cliptest.S - mmx_blend.S - 3dnow_xform1.S - 3dnow_xform2.S - 3dnow_xform3.S - 3dnow_xform4.S - 3dnow_normal.S - sse_xform1.S - sse_xform2.S - sse_xform3.S - sse_xform4.S - sse_normal.S - read_rgba_span_x86.S + $(archSources) - # tnl - t_vtx_x86_gcc.S - # glapi glapi.c glthread.c diff --git a/src/kits/tracker/FunctionObject.h b/src/kits/tracker/FunctionObject.h index c609772936..b42b7d5d1c 100644 --- a/src/kits/tracker/FunctionObject.h +++ b/src/kits/tracker/FunctionObject.h @@ -36,6 +36,7 @@ All rights reserved. #define __FUNCTION_OBJECT__ #include +#include #include #include diff --git a/src/kits/tracker/Jamfile b/src/kits/tracker/Jamfile index 729d212982..c0b466a7a4 100644 --- a/src/kits/tracker/Jamfile +++ b/src/kits/tracker/Jamfile @@ -8,7 +8,6 @@ UsePrivateHeaders tracker ; AddResources libtracker.so : TrackerIcons.rdef ; SubDirC++Flags - -fmultiple-symbol-spaces -D_BUILDING_tracker=1 -DOPEN_TRACKER=1 # -D_INCLUDES_CLASS_DEVICE_MAP=1 -D_SUPPORTS_RESOURCES=1 diff --git a/src/kits/translation/FuncTranslator.cpp b/src/kits/translation/FuncTranslator.cpp index ef5d8e5478..6fe9e2e80b 100644 --- a/src/kits/translation/FuncTranslator.cpp +++ b/src/kits/translation/FuncTranslator.cpp @@ -21,6 +21,8 @@ #include "FuncTranslator.h" +#include + namespace BPrivate { diff --git a/src/kits/translation/TranslationUtils.cpp b/src/kits/translation/TranslationUtils.cpp index 193e7124f3..9dffb2bfda 100644 --- a/src/kits/translation/TranslationUtils.cpp +++ b/src/kits/translation/TranslationUtils.cpp @@ -27,6 +27,7 @@ #include #include +#include BTranslationUtils::BTranslationUtils() diff --git a/src/kits/translation/TranslatorRoster.cpp b/src/kits/translation/TranslatorRoster.cpp index 6f43046831..839a078b4f 100644 --- a/src/kits/translation/TranslatorRoster.cpp +++ b/src/kits/translation/TranslatorRoster.cpp @@ -390,7 +390,7 @@ BTranslatorRoster::Private::AddPath(const char* path, int32* _added) status_t BTranslatorRoster::Private::AddTranslator(BTranslator* translator, - image_id image = -1, const entry_ref* ref = NULL, ino_t node = 0) + image_id image, const entry_ref* ref, ino_t node) { BAutolock locker(this); diff --git a/src/preferences/datatranslations/TranslatorListView.cpp b/src/preferences/datatranslations/TranslatorListView.cpp index 13706acfbe..c63dcaad44 100644 --- a/src/preferences/datatranslations/TranslatorListView.cpp +++ b/src/preferences/datatranslations/TranslatorListView.cpp @@ -13,6 +13,8 @@ #include +#include + static int compare_items(const void* a, const void* b) diff --git a/src/preferences/filetypes/ApplicationTypeWindow.cpp b/src/preferences/filetypes/ApplicationTypeWindow.cpp index ada2417bc6..8b562e4ece 100644 --- a/src/preferences/filetypes/ApplicationTypeWindow.cpp +++ b/src/preferences/filetypes/ApplicationTypeWindow.cpp @@ -359,7 +359,10 @@ ApplicationTypeWindow::ApplicationTypeWindow(BPoint position, const BEntry& entr fShortDescriptionControl->SetDivider(labelWidth); fShortDescriptionControl->GetPreferredSize(&width, &height); fShortDescriptionControl->ResizeTo(rect.Width(), height); - fShortDescriptionControl->TextView()->SetMaxBytes(sizeof(version_info::short_info)); + + // TODO: workaround for a GCC 4.1.0 bug? Or is that really what the standard says? + version_info versionInfo; + fShortDescriptionControl->TextView()->SetMaxBytes(sizeof(versionInfo.short_info)); box->AddChild(fShortDescriptionControl); rect.OffsetBy(0.0f, fShortDescriptionControl->Bounds().Height() + 5.0f); @@ -374,7 +377,7 @@ ApplicationTypeWindow::ApplicationTypeWindow(BPoint position, const BEntry& entr rect.bottom = rect.top + fShortDescriptionControl->Bounds().Height() * 3.0f - 1.0f; fLongDescriptionView = new BTextView(rect, "long desc", rect.OffsetToCopy(B_ORIGIN), B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS); - fLongDescriptionView->SetMaxBytes(sizeof(version_info::long_info)); + fLongDescriptionView->SetMaxBytes(sizeof(versionInfo.long_info)); // box->AddChild(fLongDescriptionView); scrollView = new BScrollView("desc scrollview", fLongDescriptionView, diff --git a/src/preferences/filetypes/IconView.cpp b/src/preferences/filetypes/IconView.cpp index 405ca7f3ca..1293367600 100644 --- a/src/preferences/filetypes/IconView.cpp +++ b/src/preferences/filetypes/IconView.cpp @@ -14,6 +14,8 @@ #include #include +#include + IconView::IconView(BRect rect, const char* name, uint32 resizeMode) : BView(rect, name, resizeMode, B_WILL_DRAW), diff --git a/src/servers/app/RGBColor.cpp b/src/servers/app/RGBColor.cpp index b2717c0bea..69c582a74c 100644 --- a/src/servers/app/RGBColor.cpp +++ b/src/servers/app/RGBColor.cpp @@ -11,6 +11,7 @@ #include "SystemPalette.h" #include +#include /*! @@ -457,6 +458,26 @@ RGBColor::operator==(const RGBColor &color) const } +bool +RGBColor::operator!=(const rgb_color &color) const +{ + return fColor32.red != color.red + || fColor32.green != color.green + || fColor32.blue != color.blue + || fColor32.alpha != color.alpha; +} + + +bool +RGBColor::operator!=(const RGBColor &color) const +{ + return fColor32.red != color.fColor32.red + || fColor32.green != color.fColor32.green + || fColor32.blue != color.fColor32.blue + || fColor32.alpha != color.fColor32.alpha; +} + + bool RGBColor::IsTransparentMagic() const { diff --git a/src/servers/app/RGBColor.h b/src/servers/app/RGBColor.h index 7bcfeaa7d2..8c3ed93dc9 100644 --- a/src/servers/app/RGBColor.h +++ b/src/servers/app/RGBColor.h @@ -34,10 +34,12 @@ class RGBColor { void SetColor(const rgb_color &color); void SetColor(const RGBColor &col); - const RGBColor & operator=(const RGBColor &col); - const RGBColor & operator=(const rgb_color &col); - bool operator==(const rgb_color &col) const; - bool operator==(const RGBColor &col) const; + const RGBColor & operator=(const RGBColor &color); + const RGBColor & operator=(const rgb_color &color); + bool operator==(const rgb_color &color) const; + bool operator==(const RGBColor &color) const; + bool operator!=(const rgb_color &color) const; + bool operator!=(const RGBColor &color) const; bool IsTransparentMagic() const; diff --git a/src/servers/app/drawing/AccelerantHWInterface.cpp b/src/servers/app/drawing/AccelerantHWInterface.cpp index cee9f2872e..2b2d477770 100644 --- a/src/servers/app/drawing/AccelerantHWInterface.cpp +++ b/src/servers/app/drawing/AccelerantHWInterface.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include diff --git a/src/servers/app/drawing/HWInterface.cpp b/src/servers/app/drawing/HWInterface.cpp index 306e9c7b08..932925f3bd 100644 --- a/src/servers/app/drawing/HWInterface.cpp +++ b/src/servers/app/drawing/HWInterface.cpp @@ -7,8 +7,7 @@ */ -#include -#include +#include "HWInterface.h" #include "drawing_support.h" @@ -17,7 +16,9 @@ #include "SystemPalette.h" #include "UpdateQueue.h" -#include "HWInterface.h" +#include +#include + // constructor HWInterface::HWInterface(bool doubleBuffered) diff --git a/src/servers/app/drawing/HWInterface.h b/src/servers/app/drawing/HWInterface.h index e19557a6a0..cfef8333cf 100644 --- a/src/servers/app/drawing/HWInterface.h +++ b/src/servers/app/drawing/HWInterface.h @@ -26,7 +26,6 @@ class ServerBitmap; class ServerCursor; class UpdateQueue; class BString; -struct overlay_buffer; enum { HW_ACC_COPY_REGION = 0x00000001,