* Remove dead code: FTGLBufferFont and FTBufferGlyph are the same as FTGLPixmapFont and FTPixmapGLyph, except the latter are actually used and do work.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528
diff --git a/include/FTGLBufferFont.h b/include/FTGLBufferFont.h
deleted file mode 100644
index 13cbd59..0000000
--- a/include/FTGLBufferFont.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * FTGL - OpenGL font library
- *
- * Copyright (c) 2001-2004 Henry Maddocks <ftgl@opengl.geek.nz>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, you can redistribute and/or modify this software under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License,
- * or (at your option) any later version.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __FTGLBufferFont__
-#define __FTGLBufferFont__
-
-#include <ftgl.h>
-
-
-/**
- * FTGLBufferFont is a specialisation of the FTFont class for handling
- * Pixmap (Grey Scale) fonts
- *
- * @see FTFont
- */
-class FTGL_EXPORT FTGLBufferFont : public FTFont
-{
- public:
- /**
- * Open and read a font file. Sets Error flag.
- *
- * @param fontname font file name.
- */
- FTGLBufferFont(const char* fontname);
-
- /**
- * Open and read a font from a buffer in memory. Sets Error flag.
- *
- * @param pBufferBytes the in-memory buffer
- * @param bufferSizeInBytes the length of the buffer in bytes
- */
- FTGLBufferFont(const unsigned char *pBufferBytes,
- size_t bufferSizeInBytes);
-
- /**
- * Destructor
- */
- ~FTGLBufferFont();
-
- void SetClientBuffer(unsigned char* b);
-};
-
-#endif // __FTGLBufferFont__
-
diff --git a/src/FTBufferGlyph.cpp b/src/FTBufferGlyph.cpp
deleted file mode 100644
index fbc0701..0000000
--- a/src/FTBufferGlyph.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * FTGL - OpenGL font library
- *
- * Copyright (c) 2001-2004 Henry Maddocks <ftgl@opengl.geek.nz>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, you can redistribute and/or modify this software under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License,
- * or (at your option) any later version.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-#include "FTBufferGlyph.h"
-
-
-FTBufferGlyph::FTBufferGlyph(FT_GlyphSlot glyph, unsigned char* b)
-: FTGlyph(glyph),
- destWidth(0),
- destHeight(0),
- data(0),
- buffer(b)
-{
- err = FT_Render_Glyph(glyph, FT_RENDER_MODE_NORMAL);
- if(err || ft_glyph_format_bitmap != glyph->format)
- {
- return;
- }
-
- FT_Bitmap bitmap = glyph->bitmap;
-
- unsigned int srcWidth = bitmap.width;
- unsigned int srcHeight = bitmap.rows;
- unsigned int srcPitch = bitmap.pitch;
-
- destWidth = srcWidth;
- destHeight = srcHeight;
- destPitch = srcPitch;
-
- if(destWidth && destHeight)
- {
- data = new unsigned char[destPitch * destHeight];
- unsigned char* dest = data + ((destHeight - 1) * destPitch);
-
- unsigned char* src = bitmap.buffer;
-
- for(unsigned int y = 0; y < srcHeight; ++y)
- {
- memcpy(dest, src, srcPitch);
- dest -= destPitch;
- src += srcPitch;
- }
- }
-
- pos.x = glyph->bitmap_left;
- pos.y = srcHeight - glyph->bitmap_top;
-}
-
-
-FTBufferGlyph::~FTBufferGlyph()
-{
- delete [] data;
-}
-
-
-float FTBufferGlyph::Render(const FTPoint& pen)
-{
- if(data && buffer)
- {
- }
-
- return advance;
-}
diff --git a/src/FTBufferGlyph.h b/src/FTBufferGlyph.h
deleted file mode 100644
index 2d8f8a0..0000000
--- a/src/FTBufferGlyph.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * FTGL - OpenGL font library
- *
- * Copyright (c) 2001-2004 Henry Maddocks <ftgl@opengl.geek.nz>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, you can redistribute and/or modify this software under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License,
- * or (at your option) any later version.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __FTBufferGlyph__
-#define __FTBufferGlyph__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_GLYPH_H
-
-#include "ftgl.h"
-#include "FTGlyph.h"
-
-
-/**
- * FTBufferGlyph is a specialisation of FTGlyph for creating pixmaps.
- *
- * @see FTGlyphContainer
- *
- */
-class FTGL_EXPORT FTBufferGlyph : public FTGlyph
-{
- public:
- /**
- * Constructor
- *
- * @param glyph The Freetype glyph to be processed
- */
- FTBufferGlyph(FT_GlyphSlot glyph, unsigned char* clientBuffer);
-
- /**
- * Destructor
- */
- virtual ~FTBufferGlyph();
-
- /**
- * Renders this glyph at the current pen position.
- *
- * @param pen The current pen position.
- * @return The advance distance for this glyph.
- */
- virtual float Render(const FTPoint& pen);
-
- // attributes
-
- private:
- /**
- * The width of the glyph 'image'
- */
- int destWidth;
-
- /**
- * The height of the glyph 'image'
- */
- int destHeight;
-
- /**
- * The pitch of the glyph 'image'
- */
- unsigned int destPitch;
-
- /**
- * Vector from the pen position to the topleft corner of the pixmap
- */
- FTPoint pos;
-
- /**
- * Pointer to the 'image' data
- */
- unsigned char* data;
-
-
- unsigned char* buffer;
-
-};
-
-
-#endif // __FTBufferGlyph__
diff --git a/src/FTGLBufferFont.cpp b/src/FTGLBufferFont.cpp
deleted file mode 100644
index f81c37a..0000000
--- a/src/FTGLBufferFont.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * FTGL - OpenGL font library
- *
- * Copyright (c) 2001-2004 Henry Maddocks <ftgl@opengl.geek.nz>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, you can redistribute and/or modify this software under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License,
- * or (at your option) any later version.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-#include "FTGLBufferFont.h"
-#include "FTGLBufferFontImpl.h"
-#include "FTBufferGlyph.h"
-
-
-//
-// FTGLBufferFont
-//
-
-
-FTGLBufferFont::FTGLBufferFont(char const *fontname) :
- FTFont(FTGL::FONT_BUFFER, fontname)
-{
- ;
-}
-
-
-FTGLBufferFont::FTGLBufferFont(unsigned char const *pBufferBytes,
- size_t bufferSizeInBytes) :
- FTFont(FTGL::FONT_BUFFER, pBufferBytes, bufferSizeInBytes)
-{
- ;
-}
-
-
-FTGLBufferFont::~FTGLBufferFont()
-{
- ;
-}
-
-
-void FTGLBufferFont::SetClientBuffer(unsigned char* b)
-{
- dynamic_cast<FTGLBufferFontImpl *>(impl)->buffer = b;
-}
-
-
-//
-// FTGLBufferFontImpl
-//
-
-
-FTGLBufferFontImpl::FTGLBufferFontImpl(const char* fontname)
-: FTFont(fontname),
- buffer(0)
-{
- ;
-}
-
-
-FTGLBufferFontImpl::FTGLBufferFontImpl(const unsigned char *pBufferBytes,
- size_t bufferSizeInBytes)
-: FTFont(pBufferBytes, bufferSizeInBytes),
- buffer(0)
-{
- ;
-}
-
-
-FTGLBufferFontImpl::~FTGLBufferFontImpl()
-{
- ;
-}
-
-
-FTGlyph* FTGLBufferFontImpl::MakeGlyph(unsigned int g)
-{
- FT_GlyphSlot ftGlyph = face.Glyph(g, FT_LOAD_NO_HINTING);
-
- if(ftGlyph)
- {
- FTBufferGlyph* tempGlyph = new FTBufferGlyph(ftGlyph, buffer);
- return tempGlyph;
- }
-
- err = face.Error();
- return NULL;
-}
-
-
-void FTGLBufferFontImpl::Render(const char* string)
-{
- if(NULL != buffer)
- {
- FTFont::Render(string);
- }
-}
-
-
-void FTGLBufferFontImpl::Render(const wchar_t* string)
-{
- if(NULL != buffer)
- {
- FTFont::Render(string);
- }
-}
-
-
diff --git a/src/FTGLBufferFontImpl.h b/src/FTGLBufferFontImpl.h
deleted file mode 100644
index 2667be9..0000000
--- a/src/FTGLBufferFontImpl.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * FTGL - OpenGL font library
- *
- * Copyright (c) 2001-2004 Henry Maddocks <ftgl@opengl.geek.nz>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, you can redistribute and/or modify this software under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License,
- * or (at your option) any later version.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __FTGLBufferFontImpl__
-#define __FTGLBufferFontImpl__
-
-#include "FTGLBufferFont.h"
-#include "FTFontImpl.h"
-
-class FTGlyph;
-class FTFontImpl;
-
-class FTGLBufferFontImpl : public FTFontImpl
-{
- friend class FTGLBufferFont;
-
- public:
- FTGLBufferFontImpl(const char* fontFilePath);
-
- FTGLBufferFontImpl(const unsigned char *pBufferBytes,
- size_t bufferSizeInBytes);
-
- ~FTGLBufferFontImpl();
-
- /**
- * Renders a string of characters
- *
- * @param string 'C' style string to be output.
- */
- void Render(const char* string);
-
- /**
- * Renders a string of characters
- *
- * @param string wchar_t string to be output.
- */
- void Render(const wchar_t* string);
-
- private:
- /**
- * Construct a FTBufferGlyph.
- *
- * @param g The glyph index NOT the char code.
- * @return An FTBufferGlyph or <code>null</code> on failure.
- */
- inline virtual FTGlyph* MakeGlyph(unsigned int g);
-
- unsigned char* buffer;
-};
-
-#endif // __FTGLBufferFontImpl__
-