Your message dated Mon, 1 Aug 2005 17:50:04 +0100
with message-id <[EMAIL PROTECTED]>
and subject line Removed
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 29 Aug 2004 11:46:22 +0000
>From [EMAIL PROTECTED] Sun Aug 29 04:46:22 2004
Return-path: <[EMAIL PROTECTED]>
Received: from b111144.adsl.hansenet.de (localhost) [62.109.111.144]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1C1O8b-0006ng-00; Sun, 29 Aug 2004 04:46:21 -0700
Received: from aj by localhost with local (Exim 4.34)
id 1C1O9V-0002Nk-Ty; Sun, 29 Aug 2004 13:47:17 +0200
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
From: Andreas Jochens <[EMAIL PROTECTED]>
Subject: panorama: FTBFS with gcc-3.4: ... is protected within this context
Message-Id: <[EMAIL PROTECTED]>
Date: Sun, 29 Aug 2004 13:47:17 +0200
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-5.0 required=4.0 tests=HAS_PACKAGE autolearn=no
version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
Package: panorama
Severity: normal
Tags: patch
When building 'panorama' with gcc-3.4 I get the following error:
../llapi/matrix.h:445: error: within this context
../llapi/matrix.h:37: error: `TScalar TBaseMatrix<TScalar>::atElement[4][4]' is
protected
../llapi/matrix.h:445: error: within this context
../llapi/matrix.h:37: error: `TScalar TBaseMatrix<TScalar>::atElement[4][4]' is
protected
../llapi/matrix.h:445: error: within this context
../llapi/matrix.h: In function `TBaseMatrix<TItem> operator*(const
TBaseMatrix<TItem>&, const TBaseMatrix<TItem>&) [with TItem = TScalar]':
aggregate.cpp:35: instantiated from here
../llapi/matrix.h:37: error: `TScalar TBaseMatrix<TScalar>::atElement[4][4]' is
protected
../llapi/matrix.h:417: error: within this context
../llapi/matrix.h:37: error: `TScalar TBaseMatrix<TScalar>::atElement[4][4]' is
protected
../llapi/matrix.h:420: error: within this context
../llapi/matrix.h:37: error: `TScalar TBaseMatrix<TScalar>::atElement[4][4]' is
protected
../llapi/matrix.h:420: error: within this context
../llapi/matrix.h:37: error: `TScalar TBaseMatrix<TScalar>::atElement[4][4]' is
protected
../llapi/matrix.h:420: error: within this context
make[2]: *** [aggregate.o] Error 1
make[2]: Leaving directory `/panorama-0.13.2/hlapi'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/panorama-0.13.2'
make: *** [build-stamp] Error 2
With the attached patch 'panorama' can be compiled using gcc-3.4.
Regards
Andreas Jochens
diff -urN ../tmp-orig/panorama-0.13.2/llapi/frame.h ./llapi/frame.h
--- ../tmp-orig/panorama-0.13.2/llapi/frame.h 1998-10-30 22:48:25.000000000
+0100
+++ ./llapi/frame.h 2004-08-28 21:09:02.000000000 +0200
@@ -120,12 +120,12 @@
void TFrame<TItem>::printDebug (void) const
{
- cerr << TDebug::_indent() << "[_Frame_]" << endl;
+ std::cerr << TDebug::_indent() << "[_Frame_]" << std::endl;
TDebug::_push();
- cerr << TDebug::_indent() << "Height : " << zHeight << endl;
- cerr << TDebug::_indent() << "Width : " << zWidth << endl;
+ std::cerr << TDebug::_indent() << "Height : " << zHeight << std::endl;
+ std::cerr << TDebug::_indent() << "Width : " << zWidth << std::endl;
TDebug::_pop();
diff -urN ../tmp-orig/panorama-0.13.2/llapi/interval.h ./llapi/interval.h
--- ../tmp-orig/panorama-0.13.2/llapi/interval.h 2004-08-29
13:05:45.399204393 +0200
+++ ./llapi/interval.h 2004-08-28 21:07:56.000000000 +0200
@@ -137,11 +137,11 @@
if ( gEmpty )
{
- cerr << "Interval [ empty ]" << endl;
+ std::cerr << "Interval [ empty ]" << std::endl;
}
else
{
- cerr << "Interval [" << tMin << ", " << tMax << "]" << endl;
+ std::cerr << "Interval [" << tMin << ", " << tMax << "]" << std::endl;
}
} /* printDebug() */
diff -urN ../tmp-orig/panorama-0.13.2/llapi/matrix.h ./llapi/matrix.h
--- ../tmp-orig/panorama-0.13.2/llapi/matrix.h 1999-04-08 20:21:50.000000000
+0200
+++ ./llapi/matrix.h 2004-08-28 21:09:58.000000000 +0200
@@ -29,10 +29,10 @@
friend class TVector3D<TItem>;
- friend TBaseMatrix<TItem> operator *<TItem> (const TBaseMatrix<TItem>&
rktMAT1, const TBaseMatrix<TItem>& rktMAT2);
- friend TVector3D<TItem> operator *<TItem> (const TBaseMatrix<TItem>& rktMAT,
const TVector3D<TItem>& rktVECTOR);
+// friend TBaseMatrix<TItem> operator *<TItem> (const TBaseMatrix<TItem>&
rktMAT1, const TBaseMatrix<TItem>& rktMAT2);
+// friend TVector3D<TItem> operator *<TItem> (const TBaseMatrix<TItem>&
rktMAT, const TVector3D<TItem>& rktVECTOR);
- protected:
+ public:
TItem atElement[4][4];
@@ -396,9 +396,9 @@
{
for (Byte J = 0; ( J < 4 ) ;J++)
{
- cerr << atElement[I][J]; cerr << " | ";
+ std::cerr << atElement[I][J]; std::cerr << " | ";
}
- cerr << endl;
+ std::cerr << std::endl;
}
} /* printDebug() */
diff -urN ../tmp-orig/panorama-0.13.2/llapi/priority_queue.h
./llapi/priority_queue.h
--- ../tmp-orig/panorama-0.13.2/llapi/priority_queue.h 1999-08-21
14:37:55.000000000 +0200
+++ ./llapi/priority_queue.h 2004-08-28 21:14:54.000000000 +0200
@@ -194,17 +194,16 @@
void TPriorityQueue<TItem>::printDebug (void) const
{
- cerr << TDebug::indent() << "[_TPriorityQueue_]" << endl;
+ std::cerr << TDebug::_indent() << "[_TPriorityQueue_]" << std::endl;
- TDebug::push();
+ TDebug::_push();
for (size_t J = 1; ( J <= zSize ) ;J++)
{
- tString << atData[J] + ", " << afPriority[J];
- cerr << TDebug::indent() << tString << endl;
+ std::cerr << TDebug::_indent() << atData[J] << ", " << afPriority[J] <<
std::endl;
}
- TDebug::pop();
+ TDebug::_pop();
} /* printDebug() */
diff -urN ../tmp-orig/panorama-0.13.2/llapi/vector2d.h ./llapi/vector2d.h
--- ../tmp-orig/panorama-0.13.2/llapi/vector2d.h 1999-08-21
14:42:56.000000000 +0200
+++ ./llapi/vector2d.h 2004-08-28 21:08:12.000000000 +0200
@@ -117,7 +117,7 @@
inline void TVector2D<TItem>::printDebug (void) const
{
- cerr << "TVector2D <" << vx << ", " << vy << ">" << endl;
+ std::cerr << "TVector2D <" << vx << ", " << vy << ">" << std::endl;
} /* printDebug() */
diff -urN
../tmp-orig/panorama-0.13.2/plugins/atm_object/atm_const/atm_const.cpp
./plugins/atm_object/atm_const/atm_const.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/atm_object/atm_const/atm_const.cpp
2004-08-29 13:05:45.409202873 +0200
+++ ./plugins/atm_object/atm_const/atm_const.cpp 2004-08-28
21:16:16.000000000 +0200
@@ -18,7 +18,7 @@
#include "atm_const.h"
-DEFINE_PLUGIN ("AtmConst", FX_ATM_OBJECT_CLASS, TAtmConst);
+DEFINE_PLUGIN ("AtmConst", FX_ATM_OBJECT_CLASS, TAtmConst)
TAtmConst::TAtmConst (void) :
TAtmosphericObject()
diff -urN
../tmp-orig/panorama-0.13.2/plugins/bsdf/cook_torrance/bsdf_cook_torrance.cpp
./plugins/bsdf/cook_torrance/bsdf_cook_torrance.cpp
---
../tmp-orig/panorama-0.13.2/plugins/bsdf/cook_torrance/bsdf_cook_torrance.cpp
2004-08-29 13:05:45.410202721 +0200
+++ ./plugins/bsdf/cook_torrance/bsdf_cook_torrance.cpp 2004-08-28
21:16:43.000000000 +0200
@@ -21,7 +21,7 @@
#include "llapi/material.h"
#include "bsdf_cook_torrance.h"
-DEFINE_PLUGIN ("BsdfCookTorrance", FX_BSDF_CLASS, TBsdfCookTorrance);
+DEFINE_PLUGIN ("BsdfCookTorrance", FX_BSDF_CLASS, TBsdfCookTorrance)
TBsdfCookTorrance::TBsdfCookTorrance (void) :
tStandardDeviation (1.0f)
diff -urN
../tmp-orig/panorama-0.13.2/plugins/bsdf/lambertian/bsdf_lambertian.cpp
./plugins/bsdf/lambertian/bsdf_lambertian.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/bsdf/lambertian/bsdf_lambertian.cpp
1998-10-11 00:46:49.000000000 +0200
+++ ./plugins/bsdf/lambertian/bsdf_lambertian.cpp 2004-08-28
21:18:03.000000000 +0200
@@ -20,4 +20,4 @@
#include "llapi/material.h"
#include "bsdf_lambertian.h"
-DEFINE_PLUGIN ("BsdfLambertian", FX_BSDF_CLASS, TBsdfLambertian);
+DEFINE_PLUGIN ("BsdfLambertian", FX_BSDF_CLASS, TBsdfLambertian)
diff -urN ../tmp-orig/panorama-0.13.2/plugins/bsdf/phong/bsdf_phong.cpp
./plugins/bsdf/phong/bsdf_phong.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/bsdf/phong/bsdf_phong.cpp
2004-08-29 13:05:45.411202569 +0200
+++ ./plugins/bsdf/phong/bsdf_phong.cpp 2004-08-28 21:18:21.000000000 +0200
@@ -21,7 +21,7 @@
#include "llapi/material.h"
#include "bsdf_phong.h"
-DEFINE_PLUGIN ("BsdfPhong", FX_BSDF_CLASS, TBsdfPhong);
+DEFINE_PLUGIN ("BsdfPhong", FX_BSDF_CLASS, TBsdfPhong)
int TBsdfPhong::setAttribute (const std::string& rktNAME, NAttribute nVALUE,
EAttribType eTYPE)
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/bsdf/schlick/bsdf_schlick.cpp
./plugins/bsdf/schlick/bsdf_schlick.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/bsdf/schlick/bsdf_schlick.cpp
2004-08-29 13:05:45.412202417 +0200
+++ ./plugins/bsdf/schlick/bsdf_schlick.cpp 2004-08-28 21:18:37.000000000
+0200
@@ -21,7 +21,7 @@
#include "llapi/material.h"
#include "bsdf_schlick.h"
-DEFINE_PLUGIN ("BsdfSchlick", FX_BSDF_CLASS, TBsdfSchlick);
+DEFINE_PLUGIN ("BsdfSchlick", FX_BSDF_CLASS, TBsdfSchlick)
TBsdfSchlick::TBsdfSchlick (void) :
tRoughness (0.3f),
diff -urN
../tmp-orig/panorama-0.13.2/plugins/bsdf/schlick_double/bsdf_schlick_double.cpp
./plugins/bsdf/schlick_double/bsdf_schlick_double.cpp
---
../tmp-orig/panorama-0.13.2/plugins/bsdf/schlick_double/bsdf_schlick_double.cpp
2004-08-29 13:05:45.413202265 +0200
+++ ./plugins/bsdf/schlick_double/bsdf_schlick_double.cpp 2004-08-28
21:18:54.000000000 +0200
@@ -21,7 +21,7 @@
#include "llapi/material.h"
#include "bsdf_schlick_double.h"
-DEFINE_PLUGIN ("BsdfSchlickDouble", FX_BSDF_CLASS, TBsdfSchlickDouble);
+DEFINE_PLUGIN ("BsdfSchlickDouble", FX_BSDF_CLASS, TBsdfSchlickDouble)
TBsdfSchlickDouble::TBsdfSchlickDouble (void)
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/bsdf/ward/bsdf_ward.cpp
./plugins/bsdf/ward/bsdf_ward.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/bsdf/ward/bsdf_ward.cpp 2004-08-29
13:05:45.414202113 +0200
+++ ./plugins/bsdf/ward/bsdf_ward.cpp 2004-08-28 21:19:08.000000000 +0200
@@ -21,7 +21,7 @@
#include "llapi/material.h"
#include "bsdf_ward.h"
-DEFINE_PLUGIN ("BsdfWard", FX_BSDF_CLASS, TBsdfWard);
+DEFINE_PLUGIN ("BsdfWard", FX_BSDF_CLASS, TBsdfWard)
TBsdfWard::TBsdfWard (void) :
tStandardDeviation_x (0.3f),
diff -urN ../tmp-orig/panorama-0.13.2/plugins/camera/pinhole/pinhole.cpp
./plugins/camera/pinhole/pinhole.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/camera/pinhole/pinhole.cpp
2004-08-29 13:05:45.415201961 +0200
+++ ./plugins/camera/pinhole/pinhole.cpp 2004-08-28 21:19:27.000000000
+0200
@@ -18,7 +18,7 @@
#include "pinhole.h"
-DEFINE_PLUGIN ("PinholeCamera", FX_CAMERA_CLASS, TPinholeCamera);
+DEFINE_PLUGIN ("PinholeCamera", FX_CAMERA_CLASS, TPinholeCamera)
int TPinholeCamera::setAttribute (const std::string& rktNAME, NAttribute
nVALUE, EAttribType eTYPE)
{
diff -urN
../tmp-orig/panorama-0.13.2/plugins/image_filter/cartoon/if_cartoon.cpp
./plugins/image_filter/cartoon/if_cartoon.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/image_filter/cartoon/if_cartoon.cpp
2004-08-29 13:05:45.416201809 +0200
+++ ./plugins/image_filter/cartoon/if_cartoon.cpp 2004-08-28
21:22:01.000000000 +0200
@@ -20,7 +20,7 @@
#include "llapi/scene.h"
#include "if_cartoon.h"
-DEFINE_PLUGIN ("IF_Cartoon", FX_IMAGE_FILTER_CLASS, TIF_Cartoon);
+DEFINE_PLUGIN ("IF_Cartoon", FX_IMAGE_FILTER_CLASS, TIF_Cartoon)
#define FX_MAX_Z (SCALAR_MAX / 2)
diff -urN
../tmp-orig/panorama-0.13.2/plugins/image_filter/convert_to_grey/if_convert_to_grey.cpp
./plugins/image_filter/convert_to_grey/if_convert_to_grey.cpp
---
../tmp-orig/panorama-0.13.2/plugins/image_filter/convert_to_grey/if_convert_to_grey.cpp
1998-10-11 00:46:49.000000000 +0200
+++ ./plugins/image_filter/convert_to_grey/if_convert_to_grey.cpp
2004-08-28 21:22:14.000000000 +0200
@@ -19,7 +19,7 @@
#include "llapi/scene.h"
#include "if_convert_to_grey.h"
-DEFINE_PLUGIN ("IF_ConvertToGrey", FX_IMAGE_FILTER_CLASS, TIF_ConvertToGrey);
+DEFINE_PLUGIN ("IF_ConvertToGrey", FX_IMAGE_FILTER_CLASS, TIF_ConvertToGrey)
void TIF_ConvertToGrey::filter (SBuffers& rsBUFFERS)
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/image_filter/fog/if_fog.cpp
./plugins/image_filter/fog/if_fog.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/image_filter/fog/if_fog.cpp
2004-08-29 13:05:45.417201657 +0200
+++ ./plugins/image_filter/fog/if_fog.cpp 2004-08-28 21:22:30.000000000
+0200
@@ -21,7 +21,7 @@
#define FX_MAX_Z (SCALAR_MAX / 2)
-DEFINE_PLUGIN ("IF_Fog", FX_IMAGE_FILTER_CLASS, TIF_Fog);
+DEFINE_PLUGIN ("IF_Fog", FX_IMAGE_FILTER_CLASS, TIF_Fog)
TIF_Fog::TIF_Fog (void) :
TImageFilter(),
diff -urN
../tmp-orig/panorama-0.13.2/plugins/image_filter/lens_flare/if_lens_flare.cpp
./plugins/image_filter/lens_flare/if_lens_flare.cpp
---
../tmp-orig/panorama-0.13.2/plugins/image_filter/lens_flare/if_lens_flare.cpp
2004-08-29 13:05:45.419201353 +0200
+++ ./plugins/image_filter/lens_flare/if_lens_flare.cpp 2004-08-28
21:22:43.000000000 +0200
@@ -27,7 +27,7 @@
#include "flare_halo.h"
#include "flare_streaks.h"
-DEFINE_PLUGIN ("IF_Lens_Flare", FX_IMAGE_FILTER_CLASS, TIF_Lens_Flare);
+DEFINE_PLUGIN ("IF_Lens_Flare", FX_IMAGE_FILTER_CLASS, TIF_Lens_Flare)
TIF_Lens_Flare::TIF_Lens_Flare (void) :
TImageFilter(),
diff -urN ../tmp-orig/panorama-0.13.2/plugins/image_filter/text/if_text.cpp
./plugins/image_filter/text/if_text.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/image_filter/text/if_text.cpp
2004-08-29 13:05:45.420201201 +0200
+++ ./plugins/image_filter/text/if_text.cpp 2004-08-29 13:05:39.576089641
+0200
@@ -25,7 +25,7 @@
extern std::multimap<std::string, std::string> tConfigData;
-DEFINE_PLUGIN ("IF_Text", FX_IMAGE_FILTER_CLASS, TIF_Text);
+DEFINE_PLUGIN ("IF_Text", FX_IMAGE_FILTER_CLASS, TIF_Text)
TIF_Text::TIF_Text (void) :
TImageFilter(),
diff -urN ../tmp-orig/panorama-0.13.2/plugins/image_io/gif/gif_io.cpp
./plugins/image_io/gif/gif_io.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/image_io/gif/gif_io.cpp 2004-08-29
13:05:45.421201049 +0200
+++ ./plugins/image_io/gif/gif_io.cpp 2004-08-28 21:23:05.000000000 +0200
@@ -21,7 +21,7 @@
#include "hlapi/image_manager.h"
#include "gif_io.h"
-DEFINE_IMAGE_IO_PLUGIN ("gif", TImageGif);
+DEFINE_IMAGE_IO_PLUGIN ("gif", TImageGif)
extern "C" {
/* Remember to configure libungif without X Windows support */
diff -urN ../tmp-orig/panorama-0.13.2/plugins/image_io/jpeg/jpeg_io.cpp
./plugins/image_io/jpeg/jpeg_io.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/image_io/jpeg/jpeg_io.cpp
2004-08-29 13:05:45.422200897 +0200
+++ ./plugins/image_io/jpeg/jpeg_io.cpp 2004-08-29 12:55:07.908117769 +0200
@@ -25,7 +25,7 @@
}
#include "jpeg_io.h"
-DEFINE_IMAGE_IO_PLUGIN ("jpeg", TImageJpeg);
+DEFINE_IMAGE_IO_PLUGIN ("jpeg", TImageJpeg)
int TImageJpeg::save (const TImage* pktIMAGE)
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/image_io/png/png_io.cpp
./plugins/image_io/png/png_io.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/image_io/png/png_io.cpp 2004-08-29
13:05:45.423200745 +0200
+++ ./plugins/image_io/png/png_io.cpp 2004-08-29 12:55:24.406609617 +0200
@@ -20,7 +20,7 @@
#include "hlapi/image_manager.h"
#include "png_io.h"
-DEFINE_IMAGE_IO_PLUGIN ("png", TImagePng);
+DEFINE_IMAGE_IO_PLUGIN ("png", TImagePng)
extern "C" {
#include <png.h>
diff -urN ../tmp-orig/panorama-0.13.2/plugins/image_io/tga/tga_io.cpp
./plugins/image_io/tga/tga_io.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/image_io/tga/tga_io.cpp 2004-08-29
13:05:45.424200593 +0200
+++ ./plugins/image_io/tga/tga_io.cpp 2004-08-29 12:55:38.549459577 +0200
@@ -21,7 +21,7 @@
#include "hlapi/image_manager.h"
#include "tga_io.h"
-DEFINE_IMAGE_IO_PLUGIN ("tga", TImageTga);
+DEFINE_IMAGE_IO_PLUGIN ("tga", TImageTga)
int TImageTga::save (const TImage* pktIMAGE)
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/light/point_light/point_light.cpp
./plugins/light/point_light/point_light.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/light/point_light/point_light.cpp
2004-08-29 13:05:45.425200441 +0200
+++ ./plugins/light/point_light/point_light.cpp 2004-08-29 12:55:57.486580697
+0200
@@ -18,7 +18,7 @@
#include "point_light.h"
-DEFINE_PLUGIN ("PointLight", FX_LIGHT_CLASS, TPointLight);
+DEFINE_PLUGIN ("PointLight", FX_LIGHT_CLASS, TPointLight)
bool TPointLight::visible (const TVector& rktPOINT) const
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/light/projector/projector.cpp
./plugins/light/projector/projector.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/light/projector/projector.cpp
2004-08-29 13:05:45.426200289 +0200
+++ ./plugins/light/projector/projector.cpp 2004-08-29 12:56:17.002613809
+0200
@@ -20,7 +20,7 @@
#include "hlapi/image_manager.h"
#include "projector.h"
-DEFINE_PLUGIN ("Projector", FX_LIGHT_CLASS, TProjector);
+DEFINE_PLUGIN ("Projector", FX_LIGHT_CLASS, TProjector)
TProjector::TProjector (void) :
TPointLight(),
diff -urN ../tmp-orig/panorama-0.13.2/plugins/light/warn_light/warn_light.cpp
./plugins/light/warn_light/warn_light.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/light/warn_light/warn_light.cpp
2004-08-29 13:05:45.426200289 +0200
+++ ./plugins/light/warn_light/warn_light.cpp 2004-08-29 12:56:45.065347625
+0200
@@ -18,7 +18,7 @@
#include "warn_light.h"
-DEFINE_PLUGIN ("WarnLight", FX_LIGHT_CLASS, TWarnLight);
+DEFINE_PLUGIN ("WarnLight", FX_LIGHT_CLASS, TWarnLight)
TScalar TWarnLight::attenuation (const TVector& rktPOINT) const
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/material/brick/mat_brick.cpp
./plugins/material/brick/mat_brick.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/material/brick/mat_brick.cpp
2004-08-29 13:05:45.427200137 +0200
+++ ./plugins/material/brick/mat_brick.cpp 2004-08-29 12:57:24.390369313
+0200
@@ -21,7 +21,7 @@
#include <time.h>
#include "mat_brick.h"
-DEFINE_PLUGIN ("MaterialBrick", FX_MATERIAL_CLASS, TMaterialBrick);
+DEFINE_PLUGIN ("MaterialBrick", FX_MATERIAL_CLASS, TMaterialBrick)
inline TScalar TMaterialBrick::step (TScalar a, TScalar x) const
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/material/checker/mat_checker.cpp
./plugins/material/checker/mat_checker.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/material/checker/mat_checker.cpp
2004-08-29 13:05:45.428199985 +0200
+++ ./plugins/material/checker/mat_checker.cpp 2004-08-29 12:58:03.275457881
+0200
@@ -18,7 +18,7 @@
#include "mat_checker.h"
-DEFINE_PLUGIN ("MaterialChecker", FX_MATERIAL_CLASS, TMaterialChecker);
+DEFINE_PLUGIN ("MaterialChecker", FX_MATERIAL_CLASS, TMaterialChecker)
int TMaterialChecker::setAttribute (const std::string& rktNAME, NAttribute
nVALUE, EAttribType eTYPE)
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/material/crackle/mat_crackle.cpp
./plugins/material/crackle/mat_crackle.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/material/crackle/mat_crackle.cpp
2004-08-29 13:05:45.429199833 +0200
+++ ./plugins/material/crackle/mat_crackle.cpp 2004-08-29 12:58:19.447999281
+0200
@@ -24,7 +24,7 @@
#include <time.h>
#include "mat_crackle.h"
-DEFINE_PLUGIN ("MaterialCrackle", FX_MATERIAL_CLASS, TMaterialCrackle);
+DEFINE_PLUGIN ("MaterialCrackle", FX_MATERIAL_CLASS, TMaterialCrackle)
TVoronoi::TVoronoi()
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/material/leopard/mat_leopard.cpp
./plugins/material/leopard/mat_leopard.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/material/leopard/mat_leopard.cpp
2004-08-29 13:05:45.430199681 +0200
+++ ./plugins/material/leopard/mat_leopard.cpp 2004-08-29 13:00:13.829610633
+0200
@@ -20,7 +20,7 @@
#include <cmath>
#include "mat_leopard.h"
-DEFINE_PLUGIN ("MaterialLeopard", FX_MATERIAL_CLASS, TMaterialLeopard);
+DEFINE_PLUGIN ("MaterialLeopard", FX_MATERIAL_CLASS, TMaterialLeopard)
int TMaterialLeopard::setAttribute (const std::string& rktNAME, NAttribute
nVALUE, EAttribType eTYPE)
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/material/marble/mat_marble.cpp
./plugins/material/marble/mat_marble.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/material/marble/mat_marble.cpp
2004-08-29 13:05:45.431199529 +0200
+++ ./plugins/material/marble/mat_marble.cpp 2004-08-29 13:00:22.622273945
+0200
@@ -19,7 +19,7 @@
#include <cmath>
#include "mat_marble.h"
-DEFINE_PLUGIN ("MaterialMarble", FX_MATERIAL_CLASS, TMaterialMarble);
+DEFINE_PLUGIN ("MaterialMarble", FX_MATERIAL_CLASS, TMaterialMarble)
diff -urN ../tmp-orig/panorama-0.13.2/plugins/material/noise/mat_noise.cpp
./plugins/material/noise/mat_noise.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/material/noise/mat_noise.cpp
2004-08-29 13:05:45.431199529 +0200
+++ ./plugins/material/noise/mat_noise.cpp 2004-08-29 13:01:01.595349137
+0200
@@ -19,7 +19,7 @@
#include <cmath>
#include "mat_noise.h"
-DEFINE_PLUGIN ("MaterialNoise", FX_MATERIAL_CLASS, TMaterialNoise);
+DEFINE_PLUGIN ("MaterialNoise", FX_MATERIAL_CLASS, TMaterialNoise)
int TMaterialNoise::setAttribute (const std::string& rktNAME, NAttribute
nVALUE, EAttribType eTYPE)
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/material/parquet/mat_parquet.cpp
./plugins/material/parquet/mat_parquet.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/material/parquet/mat_parquet.cpp
2004-08-29 13:05:45.432199377 +0200
+++ ./plugins/material/parquet/mat_parquet.cpp 2004-08-29 13:01:11.230884313
+0200
@@ -19,7 +19,7 @@
#include "mat_parquet.h"
-DEFINE_PLUGIN ("MaterialParquet", FX_MATERIAL_CLASS, TMaterialParquet);
+DEFINE_PLUGIN ("MaterialParquet", FX_MATERIAL_CLASS, TMaterialParquet)
const int akiLookup[8][8] =
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/material/wood/mat_wood.cpp
./plugins/material/wood/mat_wood.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/material/wood/mat_wood.cpp
2004-08-29 13:05:45.433199225 +0200
+++ ./plugins/material/wood/mat_wood.cpp 2004-08-29 13:00:03.502180641
+0200
@@ -19,7 +19,7 @@
#include "mat_wood.h"
-DEFINE_PLUGIN ("MaterialWood", FX_MATERIAL_CLASS, TMaterialWood);
+DEFINE_PLUGIN ("MaterialWood", FX_MATERIAL_CLASS, TMaterialWood)
inline TColor TMaterialWood::evaluate (const TVector& rktPOINT) const
diff -urN ../tmp-orig/panorama-0.13.2/plugins/material/worley/mat_worley.cpp
./plugins/material/worley/mat_worley.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/material/worley/mat_worley.cpp
2004-08-29 13:05:45.434199073 +0200
+++ ./plugins/material/worley/mat_worley.cpp 2004-08-29 13:01:20.335500201
+0200
@@ -19,7 +19,7 @@
#include <cmath>
#include "mat_worley.h"
-DEFINE_PLUGIN ("MaterialWorley", FX_MATERIAL_CLASS, TMaterialWorley);
+DEFINE_PLUGIN ("MaterialWorley", FX_MATERIAL_CLASS, TMaterialWorley)
int TMaterialWorley::setAttribute (const std::string& rktNAME, NAttribute
nVALUE, EAttribType eTYPE)
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/object/abvh/abvh.cpp
./plugins/object/abvh/abvh.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/object/abvh/abvh.cpp 2004-08-29
13:05:45.435198921 +0200
+++ ./plugins/object/abvh/abvh.cpp 2004-08-29 13:01:30.525951017 +0200
@@ -18,7 +18,7 @@
#include "abvh.h"
-DEFINE_PLUGIN ("ABVH", FX_OBJECT_CLASS, TABVH);
+DEFINE_PLUGIN ("ABVH", FX_OBJECT_CLASS, TABVH)
float TABVH::costByMethod1 (TNode* ptTREE, TObject* ptOBJ)
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/object/bezier/bezier.cpp
./plugins/object/bezier/bezier.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/object/bezier/bezier.cpp
2004-08-29 13:05:45.436198769 +0200
+++ ./plugins/object/bezier/bezier.cpp 2004-08-29 13:01:39.070652025 +0200
@@ -20,7 +20,7 @@
#include "bezier.h"
#include "beziersub.h"
-DEFINE_PLUGIN ("BezierSurface", FX_OBJECT_CLASS, TBezierSurface);
+DEFINE_PLUGIN ("BezierSurface", FX_OBJECT_CLASS, TBezierSurface)
TBezierSurface::TBezierSurface (void)
{
diff -urN
../tmp-orig/panorama-0.13.2/plugins/object/height_field/height_field.cpp
./plugins/object/height_field/height_field.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/object/height_field/height_field.cpp
2004-08-29 13:05:45.437198617 +0200
+++ ./plugins/object/height_field/height_field.cpp 2004-08-29
13:01:47.230411553 +0200
@@ -22,7 +22,7 @@
#include "hlapi/image_manager.h"
#include "height_field.h"
-DEFINE_PLUGIN ("HeightField", FX_OBJECT_CLASS, THeightField);
+DEFINE_PLUGIN ("HeightField", FX_OBJECT_CLASS, THeightField)
inline TScalar THeightField::getHeight (size_t I, size_t J) const
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/object/lwo/lwo.cpp
./plugins/object/lwo/lwo.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/object/lwo/lwo.cpp 2004-08-29
13:05:45.438198465 +0200
+++ ./plugins/object/lwo/lwo.cpp 2004-08-29 13:01:55.481157249 +0200
@@ -21,7 +21,7 @@
#include "llapi/file.h"
#include "llapi/material.h"
-DEFINE_PLUGIN ("ObjectLW", FX_OBJECT_CLASS, TLightWaveObject);
+DEFINE_PLUGIN ("ObjectLW", FX_OBJECT_CLASS, TLightWaveObject)
int TLightWaveObject::parseObject (void)
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/object/polyhedron/polyhedron.cpp
./plugins/object/polyhedron/polyhedron.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/object/polyhedron/polyhedron.cpp
2004-08-29 13:05:45.439198313 +0200
+++ ./plugins/object/polyhedron/polyhedron.cpp 2004-08-29 13:02:04.981712945
+0200
@@ -22,7 +22,7 @@
bool TPolyhedron::_gClassInitialized = false;
std::list<TPlaneData> TPolyhedron::_atPlaneDataList[5];
-DEFINE_PLUGIN ("Polyhedron", FX_OBJECT_CLASS, TPolyhedron);
+DEFINE_PLUGIN ("Polyhedron", FX_OBJECT_CLASS, TPolyhedron)
void TPolyhedron::_initializeClass (void)
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/object/subdiv/subdiv.cpp
./plugins/object/subdiv/subdiv.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/object/subdiv/subdiv.cpp
2004-08-29 13:05:45.440198161 +0200
+++ ./plugins/object/subdiv/subdiv.cpp 2004-08-29 13:02:17.127866449 +0200
@@ -23,7 +23,7 @@
#include "subdivedge.h"
#include "subdivface.h"
-DEFINE_PLUGIN ("SubdivisionSurface", FX_OBJECT_CLASS, TSubdiv);
+DEFINE_PLUGIN ("SubdivisionSurface", FX_OBJECT_CLASS, TSubdiv)
TSubdiv::TSubdiv (void)
{
diff -urN
../tmp-orig/panorama-0.13.2/plugins/object_filter/cartoon/of_cartoon.cpp
./plugins/object_filter/cartoon/of_cartoon.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/object_filter/cartoon/of_cartoon.cpp
2004-08-29 13:05:45.442197857 +0200
+++ ./plugins/object_filter/cartoon/of_cartoon.cpp 2004-08-29
13:02:36.684893329 +0200
@@ -18,7 +18,7 @@
#include "of_cartoon.h"
-DEFINE_PLUGIN ("OF_Cartoon", FX_OBJECT_FILTER_CLASS, TOF_Cartoon);
+DEFINE_PLUGIN ("OF_Cartoon", FX_OBJECT_FILTER_CLASS, TOF_Cartoon)
TColor TOF_Cartoon::filterRadiance (TSurfaceData& rtDATA, const TColor&
rktRAD) const
{
diff -urN
../tmp-orig/panorama-0.13.2/plugins/object_filter/convert_to_grey/of_convert_to_grey.cpp
./plugins/object_filter/convert_to_grey/of_convert_to_grey.cpp
---
../tmp-orig/panorama-0.13.2/plugins/object_filter/convert_to_grey/of_convert_to_grey.cpp
1999-05-23 22:19:42.000000000 +0200
+++ ./plugins/object_filter/convert_to_grey/of_convert_to_grey.cpp
2004-08-29 13:02:58.411590369 +0200
@@ -18,4 +18,4 @@
#include "of_convert_to_grey.h"
-DEFINE_PLUGIN ("OF_ConvertToGrey", FX_OBJECT_FILTER_CLASS, TOF_ConvertToGrey);
+DEFINE_PLUGIN ("OF_ConvertToGrey", FX_OBJECT_FILTER_CLASS, TOF_ConvertToGrey)
diff -urN ../tmp-orig/panorama-0.13.2/plugins/renderer/raytracer/raytracer.cpp
./plugins/renderer/raytracer/raytracer.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/renderer/raytracer/raytracer.cpp
2004-08-29 13:05:45.444197553 +0200
+++ ./plugins/renderer/raytracer/raytracer.cpp 2004-08-29 13:03:12.298479241
+0200
@@ -25,7 +25,7 @@
#include "llapi/bsdf.h"
#include "raytracer.h"
-DEFINE_PLUGIN ("Raytracer", FX_RENDERER_CLASS, TRaytracer);
+DEFINE_PLUGIN ("Raytracer", FX_RENDERER_CLASS, TRaytracer)
/*
* traceRay()
diff -urN ../tmp-orig/panorama-0.13.2/plugins/renderer/zbuffer/zbuffer.cpp
./plugins/renderer/zbuffer/zbuffer.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/renderer/zbuffer/zbuffer.cpp
2004-08-29 13:05:45.445197401 +0200
+++ ./plugins/renderer/zbuffer/zbuffer.cpp 2004-08-29 13:03:23.961706161
+0200
@@ -21,7 +21,7 @@
#include "llapi/material.h"
#include "zbuffer.h"
-DEFINE_PLUGIN ("ZBufferRenderer", FX_RENDERER_CLASS, TZBufferRenderer);
+DEFINE_PLUGIN ("ZBufferRenderer", FX_RENDERER_CLASS, TZBufferRenderer)
void TZBufferRenderer::initialize (TScene& rtSCENE)
{
diff -urN ../tmp-orig/panorama-0.13.2/plugins/scene_io/rt/rt_io.cpp
./plugins/scene_io/rt/rt_io.cpp
--- ../tmp-orig/panorama-0.13.2/plugins/scene_io/rt/rt_io.cpp 2004-08-29
13:05:45.448196945 +0200
+++ ./plugins/scene_io/rt/rt_io.cpp 2004-08-29 13:05:15.593735513 +0200
@@ -20,7 +20,7 @@
#include "parser_defs.h"
#include "rt_io.h"
-DEFINE_SCENE_IO_PLUGIN ("rt", TSceneRT);
+DEFINE_SCENE_IO_PLUGIN ("rt", TSceneRT)
std::string TSceneRT::_tInputFileName = "";
DWord TSceneRT::_dwLineNumber = 1L;
---------------------------------------
Received: (at 268827-done) by bugs.debian.org; 1 Aug 2005 16:50:18 +0000
>From [EMAIL PROTECTED] Mon Aug 01 09:50:18 2005
Return-path: <[EMAIL PROTECTED]>
Received: from sorrow.cyrius.com [65.19.161.204]
by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
id 1DzdUY-0006Yq-00; Mon, 01 Aug 2005 09:50:18 -0700
Received: by sorrow.cyrius.com (Postfix, from userid 10)
id 6036E64D54; Mon, 1 Aug 2005 16:50:13 +0000 (UTC)
Received: by deprecation.cyrius.com (Postfix, from userid 1000)
id 8760F802A; Mon, 1 Aug 2005 17:50:04 +0100 (BST)
Date: Mon, 1 Aug 2005 17:50:04 +0100
From: Martin Michlmayr <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED], [EMAIL PROTECTED],
[EMAIL PROTECTED], [EMAIL PROTECTED],
[EMAIL PROTECTED], [EMAIL PROTECTED],
[EMAIL PROTECTED]
Subject: Removed
Message-ID: <[EMAIL PROTECTED]>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.9i
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level:
X-Spam-Status: No, hits=-1.0 required=4.0 tests=BAYES_00,ONEWORD,
SORTED_RECIPS autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-CrossAssassin-Score: 6
This package has been removed from Debian (no longer maintained
upstream).
--
Martin Michlmayr
http://www.cyrius.com/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
