PR 1200: Reverting to 0.7.1 with patch to README.md

 - Revert "update version file" (reverting to 0.7.1)
 - Revert "PR 1171: Merge ziv_release_0_7_2_windows_fix to release_0.7.x"
 - Merged (patched) README.md from development

Author: zivsha

README.md

@@ -1,30 +1,19 @@
 # Intel® RealSense™ SDK for Linux
 
+The Intel® RealSense™ SDK for Linux provides libraries, tools, and samples to develop applications using Intel® RealSense™ cameras, over the Intel® RealSense™ Cross Platform API (also known as librealsense). 
 
-
-[![Release] [release-image] ] [releases]
-[![License] [license-image] ] [license]
-
-[release-image]: http://img.shields.io/badge/release-0.7.2-blue.svg?style=flat
-[releases]: https://github.com/IntelRealSense/realsense_sdk/tree/v0.7.2
-
-[license-image]: http://img.shields.io/badge/license-Apache--2-blue.svg?style=flat
-[license]: LICENSE
-
-
-The Intel® RealSense™ SDK for Linux provides libraries, tools, and samples to develop applications using Intel® RealSense™ cameras, over the Intel librealsense API. 
-
-The SDK provides functionality of record and playback of camera streams for test and validation. 
+The SDK provides functionality for record and playback of camera streams for test and validation. 
 
 The SDK includes libraries which support the camera stream projection of streams into a common world-space viewpoint, and libraries which enable the use of multiple middleware modules simultaneously for common multi-modal scenarios.  
 
 # Table of Contents 
 * [Compatible Devices](#compatible-devices)
-* [Supported Platforms](#compatible-platforms)
-* [Supported Languages and Frameworks](#supported-languages-and-frameworks)
+* [Compatible Platforms](#compatible-platforms)
 * [Functionality](#functionality)
 * [Dependencies List](#dependencies-list)
+* [Supported Languages and Frameworks](#supported-languages-and-frameworks)
 * [Learn More](#learn-more)
+* [License](#license)
 
 ## Compatible Devices
 
@@ -37,21 +26,17 @@ The library is written in standards-conforming C++11.
 It has been developed and tested on Ubuntu 16.04 x64 (GCC 5.4 toolchain).
 
 
-## Supported Languages and Frameworks
-
-C++ 
-
 ## Functionality
 
 **Note**: This API is experimental and is not an official Intel product. 
 It is subject to incompatible API changes in future updates. Breaking API changes are noted through release numbers.
 
 1. **Record and Play**    
     - **Record**: The record module provides a utility to create a file, which can be used by the playback module to create a video source.
-    The record module provides the same camera API as defined by the SDK (librealsense) and the record API to configure recording parameters such as output file and state (pause and resume).
-    The record module loads librealsense to access the camera device and execute the set requests and reads, while writing the configuration and changes to the file.
+    The record module provides the same camera API as defined by the SDK (Intel® RealSense™ Cross Platform API) and the record API to configure recording parameters such as output file and state (pause and resume).
+    The record module loads Intel® RealSense™ Cross Platform API to access the camera device and execute the set requests and reads, while writing the configuration and changes to the file.
     - **Playback**: The playback module provides a utility to create a video source from a file. 
-    The playback module provides the same camera API as defined by the SDK (librealsense), and the playback API to configure recording parameters such as input file, playback mode, seek, and playback state (pause and resume).
+    The playback module provides the same camera API as defined by the SDK (Intel® RealSense™ Cross Platform API), and the playback API to configure recording parameters such as input file, playback mode, seek, and playback state (pause and resume).
     The playback module supports files that were recorded using the Linux SDK recorder and the Windows RSSDK recorder (up to version 2016 R2).
 
 2. **Frame data container**
@@ -69,7 +54,7 @@ It is subject to incompatible API changes in future updates. Breaking API change
     The application can focus on consuming the computer vision output, leaving the camera configuration and streaming details for the pipeline to handle.
 
 5. **Samples**
-    - **Projection**: The sample demonstrates how to use the different spatial correlation and projection functions, from live camera and recorded file
+    - **Projection**: The sample demonstrates how to use the different spatial correlation and projection functions, from live camera and recorded file.
     - **Record and Playback**: The sample demonstrates how to record and play back a file while the application is streaming, with and without an active CV module,      with minimal changes to the application, compared to live streaming.
     - **Video module, asynchronized**: The sample demonstrates an application usage of a Computer Vision module, which implements asynchronous sample processing. 
     - **Video module, synchronized**: The sample demonstrates an application usage of a Computer Vision module, which implements synchronous samples processing.
@@ -92,28 +77,26 @@ It is subject to incompatible API changes in future updates. Breaking API change
 
 To successfully compile and use the SDK, you should install the following dependencies:
 
- - [Intel librealsense v1.12.1](https://github.com/IntelRealSense/librealsense/tree/v1.12.1)
+ - [Intel RealSense Cross Platform API v1.12.1](https://github.com/IntelRealSense/librealsense/tree/v1.12.1)
  - OpenCV 3.1
  - CMake
  - OpenGL GLFW version 3
  - [liblz4-dev](https://github.com/lz4/lz4)
  - Apache log4cxx – optional. Needed only if you want to enable logs.
+ - Doxygen - optional. Needed only if you want to generate dynamic documentation for the project. 
+
+## Supported Languages and Frameworks
 
+C++ 
 
 ## Learn More
 
-For more information, please refer to the [doc folder](https://github.com/IntelRealSense/realsense_sdk/tree/master/sdk/doc). 
-
-For a Quick Start guide to developing an application over the SDK, refer to the **Intel® RealSense™ SDK for Linux Getting Started**.
-
-For detailed instructions on developing over the SDK, refer to the **Intel® RealSense™ SDK for Linux Developer's Guide**.
-
-For a detailed description of the SDK API methods, refer to the **Intel® RealSense™ SDK for Linux Developer's Reference**. 
+For detailed instructions on developing using this library, please refer to [**Intel® RealSense™ SDK for Linux Documentation**](https://software.intel.com/sites/products/realsense/sdk)
 
 
 ## License
 
-Copyright 2016 Intel Corporation
+Copyright 2017 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this project except in compliance with the License.

cmake_includes/config_windows.cmake

@@ -36,7 +36,7 @@ endif(NOT DEFINED LZ4_DIR)
 set(LZ4_INCLUDE_PATH ${LZ4_DIR}/lib/)
 set(LZ4_LIB_PATH ${LZ4_DIR}/visual/VS2010/bin/x64_Release/)
 
-set(COMPILE_DEFINITIONS /W3)
+set(COMPILE_DEFINITIONS -Wall)
 set(OPENCV_VER 310)
 set(OPENGL_LIBS OpenGL32)
 set(GLFW_LIBS glfw3)

sdk/CMakeVersion

@@ -1,3 +1,3 @@
 set(SDK_VERSION_MAJOR 0 )
 set(SDK_VERSION_MINOR 7 )
-set(SDK_VERSION_PATCH 2 )
+set(SDK_VERSION_PATCH 1 )

sdk/include/rs/core/image_interface.h

@@ -12,16 +12,6 @@
 #include "rs/utils/release_self_base.h"
 #include "types.h"
 
-#ifdef WIN32 
-#ifdef realsense_image_EXPORTS
-#define  DLL_EXPORT __declspec(dllexport)
-#else
-#define  DLL_EXPORT __declspec(dllimport)
-#endif /* realsense_image_EXPORTS */
-#else /* defined (WIN32) */
-#define DLL_EXPORT
-#endif
-
 namespace rs
 {   /**
      * @brief Forward declaration of \c rs::frame. Required to create an image from librealsense frame input.
@@ -81,7 +71,7 @@ namespace rs
         * The image lifetime is managed by the image user, through calling the inherent \c ref_count_interface. The user must increase the image reference count
         * when required, and release the image, instead of deleting the object directly. This interface is designed to conform with ABI compatibility requirements.  
         */
-        class DLL_EXPORT image_interface : public ref_count_interface
+        class image_interface : public ref_count_interface
         {
         public:
             /**

sdk/include/rs/core/pipeline_async.h

@@ -9,16 +9,6 @@
 #pragma once
 #include "rs/core/pipeline_async_interface.h"
 
-#ifdef WIN32
-#ifdef realsense_pipeline_EXPORTS
-#define  DLL_EXPORT __declspec(dllexport)
-#else
-#define  DLL_EXPORT __declspec(dllimport)
-#endif /* realsense_pipeline_EXPORTS */
-#else /* defined (WIN32) */
-#define DLL_EXPORT
-#endif
-
 namespace rs
 {
     namespace core
@@ -33,7 +23,7 @@ namespace rs
          *
          * For complete class documentation, see \c pipeline_async_interface.
          */
-        class DLL_EXPORT pipeline_async : public pipeline_async_interface
+        class pipeline_async : public pipeline_async_interface
         {
         public:
             /**

sdk/include/rs/core/projection_interface.h

@@ -19,13 +19,13 @@
 #define  DLL_EXPORT __declspec(dllexport)
 #else
 #define  DLL_EXPORT __declspec(dllimport)
-#endif /* realsense_projection_EXPORTS */
+#endif /* realsense_log_utils_EXPORTS */
 #else /* defined (WIN32) */
 #define DLL_EXPORT
 #endif
 
-DLL_EXPORT extern "C" {
-	void*  rs_projection_create_instance_from_intrinsics_extrinsics(rs::core::intrinsics *colorIntrinsics, rs::core::intrinsics *depthIntrinsics, rs::core::extrinsics *extrinsics);
+extern "C" {
+    void* rs_projection_create_instance_from_intrinsics_extrinsics(rs::core::intrinsics *colorIntrinsics, rs::core::intrinsics *depthIntrinsics, rs::core::extrinsics *extrinsics);
 }
 
 namespace rs

sdk/include/rs/playback/playback_context.h

@@ -10,16 +10,6 @@
 #include <librealsense/rs.hpp>
 #include "rs/core/context.h"
 
-#ifdef WIN32 
-#ifdef realsense_playback_EXPORTS
-#define  DLL_EXPORT __declspec(dllexport)
-#else
-#define  DLL_EXPORT __declspec(dllimport)
-#endif /* realsense_playback_EXPORTS */
-#else /* defined (WIN32) */
-#define DLL_EXPORT
-#endif
-
 namespace rs
 {
     namespace playback
@@ -30,7 +20,7 @@ namespace rs
 		*
 		* See the interface class for more details.
         */
-        class DLL_EXPORT context : public rs::core::context_interface
+        class context : public rs::core::context_interface
         {
         public:
             context(const char * file_path);

sdk/include/rs/playback/playback_device.h

@@ -10,16 +10,6 @@
 #pragma once
 #include <librealsense/rs.hpp>
 
-#ifdef WIN32 
-#ifdef realsense_playback_EXPORTS
-#define  DLL_EXPORT __declspec(dllexport)
-#else
-#define  DLL_EXPORT __declspec(dllimport)
-#endif /* realsense_playback_EXPORTS */
-#else /* defined (WIN32) */
-#define DLL_EXPORT
-#endif
-
 namespace rs
 {
     namespace playback
@@ -62,7 +52,7 @@ namespace rs
         * Some of the captured data, such as frame metadata fields, reflects the actual behavior at the time of recording, and not the actual playback behavior.
         * Creating the \c rs::playback::device and defining the source file location is done using \c rs::playback::context.
         */
-        class DLL_EXPORT device : public rs::device
+        class device : public rs::device
         {
         public:
             /**

sdk/include/rs/record/record_context.h

@@ -10,16 +10,6 @@
 #include <librealsense/rs.hpp>
 #include "rs/core/context.h"
 
-#ifdef WIN32 
-#ifdef realsense_record_EXPORTS
-#define  DLL_EXPORT __declspec(dllexport)
-#else
-#define  DLL_EXPORT __declspec(dllimport)
-#endif /* realsense_record_EXPORTS */
-#else /* defined (WIN32) */
-#define DLL_EXPORT
-#endif
-
 namespace rs
 {
     namespace record
@@ -30,7 +20,7 @@ namespace rs
 		*
 		* See the interface class for more details.
         */
-        class DLL_EXPORT context : public rs::core::context
+        class context : public rs::core::context
         {
         public:
             context(const char * file_path);

sdk/include/rs/record/record_device.h

@@ -10,16 +10,6 @@
 #include <librealsense/rs.hpp>
 #include "rs/core/status.h"
 
-#ifdef WIN32 
-#ifdef realsense_record_EXPORTS
-#define  DLL_EXPORT __declspec(dllexport)
-#else
-#define  DLL_EXPORT __declspec(dllimport)
-#endif /* realsense_record_EXPORTS */
-#else /* defined (WIN32) */
-#define DLL_EXPORT
-#endif
-
 namespace rs
 {
     namespace record
@@ -43,7 +33,7 @@ namespace rs
 		*
         * The record device supports recording a single session of streaming. Hence, a single device and streams configuration is captured.
         */
-        class DLL_EXPORT device : public rs::device
+        class device : public rs::device
         {
         public:
             /**