Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 631 → Rev 632

/branches/Version13x/Scribus/admin/acinclude.m4.in
4182,13 → 4182,15
 
AC_DEFUN([KDE_CHECK_PYTHON],
[
KDE_CHECK_PYTHON_INTERN("2.3",
[KDE_CHECK_PYTHON_INTERN("2.2",
KDE_CHECK_PYTHON_INTERN("2.4",
[KDE_CHECK_PYTHON_INTERN("2.3",
[KDE_CHECK_PYTHON_INTERN("2.2",
[KDE_CHECK_PYTHON_INTERN("2.1",
[KDE_CHECK_PYTHON_INTERN("2.0",
[KDE_CHECK_PYTHON_INTERN($1, $2) ])
])
])
])
])
])
 
/branches/Version13x/Scribus/config.h.in
9,6 → 9,12
/* ColorManagement */
#undef HAVE_CMS
 
/* Define if you have the CoreAudio API */
#undef HAVE_COREAUDIO
 
/* Define to 1 if you have the <crt_externs.h> header file. */
#undef HAVE_CRT_EXTERNS_H
 
/* Defines if your system has the crypt function */
#undef HAVE_CRYPT
 
15,6 → 21,9
/* Cups */
#undef HAVE_CUPS
 
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
 
/* Defines if your system has the libfontconfig library */
#undef HAVE_FONTCONFIG
 
42,9 → 51,8
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
 
/* Define to 1 if you have the <pthread/linuxthreads/pthread.h> header file.
*/
#undef HAVE_PTHREAD_LINUXTHREADS_PTHREAD_H
/* Define if your system needs _NSGetEnviron to set up the environment */
#undef HAVE_NSGETENVIRON
 
/* Define if you have the development files for python */
#undef HAVE_PYTHON
55,6 → 63,9
/* Define if you have the res_init function */
#undef HAVE_RES_INIT
 
/* Define to 1 if you have the `snprintf' function. */
#undef HAVE_SNPRINTF
 
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
 
67,6 → 78,21
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
 
/* Define if you have strlcat */
#undef HAVE_STRLCAT
 
/* Define if you have the strlcat prototype */
#undef HAVE_STRLCAT_PROTO
 
/* Define if you have strlcpy */
#undef HAVE_STRLCPY
 
/* Define if you have the strlcpy prototype */
#undef HAVE_STRLCPY_PROTO
 
/* Define to 1 if you have the <sys/bitypes.h> header file. */
#undef HAVE_SYS_BITYPES_H
 
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
 
73,9 → 99,6
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
 
/* C++ compiler supports template repository */
#undef HAVE_TEMPLATE_REPOSITORY
 
/* Tifflib */
#undef HAVE_TIFF
 
82,8 → 105,8
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
 
/* Define if you want Xinerama support */
#undef HAVE_XINERAMA
/* Define to 1 if you have the `vsnprintf' function. */
#undef HAVE_VSNPRINTF
 
/* Defines if your system has the libxml2 library */
#undef HAVE_XML
91,6 → 114,9
/* Defines if your system has the libxml2 library6 */
#undef HAVE_XML26
 
/* Suffix for lib directories */
#undef KDELIBSUFF
 
/* Name of package */
#undef PACKAGE
 
112,9 → 138,6
/* Dataprefix */
#undef PREL
 
/* The size of a `char', as computed by sizeof. */
#undef SIZEOF_CHAR
 
/* The size of a `char *', as computed by sizeof. */
#undef SIZEOF_CHAR_P
 
124,6 → 147,15
/* The size of a `long', as computed by sizeof. */
#undef SIZEOF_LONG
 
/* The size of a `short', as computed by sizeof. */
#undef SIZEOF_SHORT
 
/* The size of a `size_t', as computed by sizeof. */
#undef SIZEOF_SIZE_T
 
/* The size of a `unsigned long', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_LONG
 
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
 
134,6 → 166,88
first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN
 
/*
* jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
* headers and I'm too lazy to write a configure test as long as only
* unixware is related
*/
#ifdef _UNIXWARE
#define HAVE_BOOLEAN
#endif
 
 
 
/*
* AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
* that defines bzero.
*/
 
#if defined(_AIX)
#include <strings.h>
#endif
 
 
 
#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
# include <sys/time.h>
# include <crt_externs.h>
# define environ (*_NSGetEnviron())
#endif
 
 
 
#if !defined(HAVE_STRLCAT_PROTO)
#ifdef __cplusplus
extern "C" {
#endif
unsigned long strlcat(char*, const char*, unsigned long);
#ifdef __cplusplus
}
#endif
#endif
 
 
 
#if !defined(HAVE_STRLCPY_PROTO)
#ifdef __cplusplus
extern "C" {
#endif
unsigned long strlcpy(char*, const char*, unsigned long);
#ifdef __cplusplus
}
#endif
#endif
 
 
 
/*
* On HP-UX, the declaration of vsnprintf() is needed every time !
*/
 
#if !defined(HAVE_VSNPRINTF) || defined(hpux)
#if __STDC__
#include <stdarg.h>
#include <stdlib.h>
#else
#include <varargs.h>
#endif
#ifdef __cplusplus
extern "C"
#endif
int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
#ifdef __cplusplus
extern "C"
#endif
int snprintf(char *str, size_t n, char const *fmt, ...);
#endif
 
 
 
#if defined(__SVR4) && !defined(__svr4__)
#define __svr4__ 1
#endif
 
 
/* Compatibility define */
#undef ksize_t
 
/branches/Version13x/Scribus/scribus/scpainter.cpp
427,8 → 427,8
// set up world matrix
double affine[6];
affine[0] = m_matrix.m11();
affine[1] = m_matrix.m12(); // was 0 in Karbon
affine[2] = m_matrix.m21(); // was 0 in Karbon, don't know why
affine[1] = m_matrix.m12();
affine[2] = m_matrix.m21();
affine[3] = m_matrix.m22();
affine[4] = m_matrix.dx();
affine[5] = m_matrix.dy();
664,8 → 664,7
double cy = gradient.origin().y() * m_zoomFactor;
double fx = gradient.focalPoint().x() * m_zoomFactor;
double fy = gradient.focalPoint().y() * m_zoomFactor;
double r = sqrt( pow( gradient.vector().x() - gradient.origin().x(), 2 ) +
pow( gradient.vector().y() - gradient.origin().y(), 2 ) );
double r = sqrt( pow( gradient.vector().x() - gradient.origin().x(), 2 ) + pow( gradient.vector().y() - gradient.origin().y(), 2 ) );
r *= m_zoomFactor;
 
radial->fx = (fx - cx) / r;
819,8 → 818,8
ArtVpath *vec = art_bez_path_to_vec( m_path , 0.25 );
double affine[6];
affine[0] = m_matrix.m11();
affine[1] = m_matrix.m12(); // was 0 in Karbon
affine[2] = m_matrix.m21(); // was 0 in Karbon, don't know why
affine[1] = m_matrix.m12();
affine[2] = m_matrix.m21();
affine[3] = m_matrix.m22();
affine[4] = m_matrix.dx();
affine[5] = m_matrix.dy();
845,8 → 844,8
affineresult[1] = m_matrix.m12() * m_zoomFactor;
affineresult[2] = m_matrix.m21() * m_zoomFactor;
affineresult[3] = m_matrix.m22() * m_zoomFactor;
affineresult[4] = m_matrix.dx(); // * m_zoomFactor;
affineresult[5] = m_matrix.dy(); // * m_zoomFactor;
affineresult[4] = m_matrix.dx();
affineresult[5] = m_matrix.dy();
ksvg_art_rgb_affine_clip( m_clipPath, m_buffer, 0, 0, m_width, m_height, m_width * 4, 4,
image->bits(), image->width(), image->height(), image->width() * 4,
affineresult, qRound( 255 * fill_trans ), 0L );
877,6 → 876,8
m_path[ m_index ].code = ART_MOVETO;
else
m_path[ m_index ].code = ART_MOVETO_OPEN;
/* m_path[ m_index ].x3 = np.x();
m_path[ m_index ].y3 = np.y(); */
m_path[ m_index ].x3 = np.x() * m_zoomFactor;
m_path[ m_index ].y3 = np.y() * m_zoomFactor;
m_index++;
890,6 → 891,8
if ((np == np1) && (np2 == np3))
{
m_path[ m_index ].code = ART_LINETO;
/* m_path[ m_index ].x3 = np3.x();
m_path[ m_index ].y3 = np3.y(); */
m_path[ m_index ].x3 = np3.x() * m_zoomFactor;
m_path[ m_index ].y3 = np3.y() * m_zoomFactor;
}
896,6 → 899,12
else
{
m_path[ m_index ].code = ART_CURVETO;
/* m_path[ m_index ].x1 = np1.x();
m_path[ m_index ].y1 = np1.y();
m_path[ m_index ].x2 = np2.x();
m_path[ m_index ].y2 = np2.y();
m_path[ m_index ].x3 = np3.x();
m_path[ m_index ].y3 = np3.y(); */
m_path[ m_index ].x1 = np1.x() * m_zoomFactor;
m_path[ m_index ].y1 = np1.y() * m_zoomFactor;
m_path[ m_index ].x2 = np2.x() * m_zoomFactor;
/branches/Version13x/Scribus/scribus/scribusview.cpp
755,7 → 755,7
}
}
 
void ScribusView::contentsDragLeaveEvent(QDragLeaveEvent *e)
void ScribusView::contentsDragLeaveEvent(QDragLeaveEvent *)
{
if (DraggedGroup)
{
2434,7 → 2434,7
else
{
SizeItem(b->PoLine.WidthHeight().x(), b->PoLine.WidthHeight().y(), b->ItemNr, false, false, false);
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)), qRound(QMAX(b->Pwidth / 2, 1)));
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)));
AdjustItemSize(b);
b->Sizing = ssiz;
b->ContourLine = b->PoLine.copy();
2447,7 → 2447,7
b = SelItem.at(0);
b->PoLine.resize(b->PoLine.size()-2);
SizeItem(b->PoLine.WidthHeight().x(), b->PoLine.WidthHeight().y(), b->ItemNr, false, false);
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)), qRound(QMAX(b->Pwidth / 2, 1)));
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)));
AdjustItemSize(b);
b->ContourLine = b->PoLine.copy();
Doc->AppMode = 1;
3491,7 → 3491,7
edited = true;
Doc->EditClipMode = 0;
b->PType = 7;
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)), qRound(QMAX(b->Pwidth / 2, 1)));
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)));
emit PolyOpen();
}
else
3517,7 → 3517,7
b->ClipEdited = true;
edited = true;
Doc->EditClipMode = 0;
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)), qRound(QMAX(b->Pwidth / 2, 1)));
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)));
emit PolyOpen();
}
}
4055,7 → 4055,7
MoveItem(0, npf2.y(), b);
}
SizeItem(b->PoLine.WidthHeight().x(), b->PoLine.WidthHeight().y(), b->ItemNr, false, false, false);
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)), qRound(QMAX(b->Pwidth / 2, 1)));
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)));
b->paintObj();
// FirstPoly = false;
emit ItemPos(b->Xpos, b->Ypos);
4667,7 → 4667,7
updateGradientVectors(b);
}
 
void ScribusView::SetPolyClip(PageItem *b, int up, int down)
void ScribusView::SetPolyClip(PageItem *b, int up)
{
QPoint np, np2;
QPointArray cl, cl1, cl2;
4718,7 → 4718,7
if (des > desc)
desc = des;
}
SetPolyClip(b, static_cast<int>(asce+b->BaseOffs), static_cast<int>(desc+b->BaseOffs));
SetPolyClip(b, static_cast<int>(asce+b->BaseOffs));
}
 
void ScribusView::MarkClip(PageItem *b)
5711,7 → 5711,7
b->ClipEdited = true;
b->PoLine = Clip.copy();
if (b->PType == 7)
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)), qRound(QMAX(b->Pwidth / 2, 1)));
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)));
else
b->Clip = FlattenPath(b->PoLine, b->Segments);
b->Sizing = siz;
7003,7 → 7003,7
static QProcess *proc = 0;
static AppUserFilter *filter = 0;
 
bool AppUserFilter::eventFilter(QObject *o, QEvent *e )
bool AppUserFilter::eventFilter(QObject *, QEvent *e )
{
switch(e->type())
{
7452,7 → 7452,7
PageItem *b = SelItem.at(0);
b->PType = 7;
b->ClipEdited = true;
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)), qRound(QMAX(b->Pwidth / 2, 1)));
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)));
AdjustItemSize(b);
RefreshItem(b);
emit HaveSel(b->PType);
8819,7 → 8819,7
b->OldPwidth = b->Pwidth;
b->Pwidth = w;
if (b->PType == 7)
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)), qRound(QMAX(b->Pwidth / 2, 1)));
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)));
if (b->PType == 5)
{
int ph = static_cast<int>(QMAX(1.0, w / 2.0));
10610,7 → 10610,7
bb->PoLine = b->PoLine.copy();
bb->ClipEdited = true;
bb->Rot = b->Rot;
SetPolyClip(bb, qRound(QMAX(bb->Pwidth / 2, 1)), qRound(QMAX(bb->Pwidth / 2, 1)));
SetPolyClip(bb, qRound(QMAX(bb->Pwidth / 2, 1)));
AdjustItemSize(bb);
b->PType = 4;
b->Pcolor2 = "None";