Commit f8786b4f authored by Davis King's avatar Davis King

updated docs

parent 95cb5697
......@@ -85,13 +85,13 @@ tell CMake which one you want it to use via the -G option.
builds correctly.
</p>
<p>
Note also that if you want to work with jpeg/png files using dlib then you will
need to link your program with libjpeg and/or libpng. You also need to tell dlib
about this by defining the DLIB_JPEG_SUPPORT and DLIB_PNG_SUPPORT preprocessor directives.
How you "link to libjpeg/libpng" varies from platform to platform. On UNIX machines you
usually just add a -ljpeg or -lpng switch to your compiler (after installing the libraries).
On windows it's less well defined. So dlib comes with a copy of these libraries in the dlib/external
folder so that you can statically compile them into your application if no system wide version
Note also that if you want to work with jpeg/png/gif files using dlib then you will
need to link your program with libjpeg, libpng, and/or libgif. You also need to tell dlib
about this by defining the DLIB_JPEG_SUPPORT, DLIB_PNG_SUPPORT, and DLIB_GIF_SUPPORT preprocessor directives.
How you "link to libjpeg/libpng/libgif" varies from platform to platform. On UNIX machines you
usually just add a -ljpeg, -lpng, or -lgif switch to your compiler (after installing the libraries).
On windows it's less well defined. So dlib comes with a copy of libjpeg and libpng in the dlib/external
folder so you can statically compile them into your application if no system wide version
is available on your machine. If all this talk about linking is confusing to you then
just use CMake. It will set this all up for you.
</p>
......
......@@ -1081,11 +1081,13 @@
This global function takes a file name, looks at its extension, and
then loads it into an <a href="containers.html#array2d">array2d</a> of
<a href="dlib/pixel.h.html">pixels</a> using the appropriate image
loading routine. The supported types are BMP, PNG, JPEG, and the dlib DNG file format.
loading routine. The supported types are BMP, PNG, JPEG, GIF, and the dlib DNG file format.
<p>
Note that you can only load PNG and JPEG files if you link against
libpng and libjpeg respectively.
Note that you can only load PNG, JPEG, and GIF files if you link against
libpng, libjpeg, and libgif respectively. You will also need to #define
DLIB_PNG_SUPPORT, DLIB_JPEG_SUPPORT, and DLIB_GIF_SUPPORT. Or use CMake and
it will do all this for you.
</p>
</description>
......
......@@ -12,12 +12,52 @@
<current>
New Features:
- Added random_color_transform and disturb_colors().
- Added a constructor for seeding rand with a time_t.
- Added apply_random_color_offset()
- Made load_image() support GIF files.
- Added subm_clipped()
- load_mnist_dataset()
- Added an option to solve the L2-loss version of the SVM objective function for svm_c_linear_dcd_trainer.
- Added the option to use the elastic net regularizer to the OCA solver.
- Added solve_qp_box_constrained()
- Added unserialize.
- MATLAB binding stuff
- link to MATLAB's intel MKL when used on linux
- struct support, more arguments (20 now instead of 10),
- in place operation. Made column major matrices directly wrap matlab
matrix objects when used inside mex files. This way, if you use
matrix_colmajor or fmatrix_colmajor in a mex file it will not do any
unnecessary copying or transposing.
- catch ctrl+c presses in MATLAB console.
- DLIB_ASSERTS won't kill the matlab process, just throw an exception
- Made cerr print in matlab as a red warning message.
- C++11 only tools
- Added log1pexp()
- Added running_gradient
- deep learning tools
- dnn_trainer
- cuDNN v4.0
- auto step size adjust and stopping condition.
- CUDA/tensor stuff
- gpu_data, tensor, alias tensors
Non-Backwards Compatible Changes:
- Everything in dlib/matlab/call_matlab.h is now in the dlib namespace.
Bug fixes:
- Fixed bug in 10 argument version of call_matlab() and also cleaned up a few
minor things.
- setup.py and cmake scripts work in a few more contexts.
Other:
- Made cmake scripts uniformly require cmake version 2.8.4.
- C++11
- CMake scripts now enable C++11 by default
- Gave array2d and matrix move constructors and move assignment operators.
</current>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment